merge trunk 17122:17213
[blender-staging.git] / tools / __init__.py