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

[Campbell Barton]

Commit: 6b8132a153d0bad697005d1d93c9827c2be8a273
Author: Campbell Barton
Date:   Tue Aug 29 19:38:01 2017 +1000
Branches: blender2.8
https://developer.blender.org/rB6b8132a153d0bad697005d1d93c9827c2be8a273

Merge branch 'master' into blender2.8

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



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