merge with trunk (15330 -> 15566)
[blender.git] / tools / __init__.py