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

[Campbell Barton]

Commit: 9bdd12d884c5130397e67f72caad2770d9524c9a
Author: Campbell Barton
Date:   Tue Jul 25 17:36:49 2017 +1000
Branches: blender2.8
https://developer.blender.org/rB9bdd12d884c5130397e67f72caad2770d9524c9a

Merge branch 'master' into blender2.8

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



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