merging 17300:17342
[blender-staging.git] / tools / __init__.py