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

[Campbell Barton]

Commit: 5ee5c595bac34c9f914724ba1212210e8b821821
Author: Campbell Barton
Date:   Wed Jul 12 23:18:11 2017 +1000
Branches: blender2.8
https://developer.blender.org/rB5ee5c595bac34c9f914724ba1212210e8b821821

Merge branch 'master' into blender2.8

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



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