[Bf-blender-cvs] [074c5f0d26b] blender2.8: Merge branch 'master' into blender2.8

[Sybren A. Stüvel]

Commit: 074c5f0d26b20fbb69e558af3e9a6f4183a2ad29
Author: Sybren A. Stüvel
Date:   Fri Apr 28 15:52:07 2017 +0200
Branches: blender2.8
https://developer.blender.org/rB074c5f0d26b20fbb69e558af3e9a6f4183a2ad29

Merge branch 'master' into blender2.8

===================================================================



===================================================================