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

[Bastien Montagne]

Commit: b282716c3aae68d5fc781e7fc5df0241c3d91198
Author: Bastien Montagne
Date:   Mon Aug 7 16:16:43 2017 +0200
Branches: blender2.8
https://developer.blender.org/rBb282716c3aae68d5fc781e7fc5df0241c3d91198

Merge branch 'master' into blender2.8

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



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