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

[Campbell Barton]

Commit: cc5d55fad496b0e76b4b48bc6df955ddfd1fc846
Author: Campbell Barton
Date:   Thu Aug 30 01:05:46 2018 +1000
Branches: blender2.8
https://developer.blender.org/rBcc5d55fad496b0e76b4b48bc6df955ddfd1fc846

Merge branch 'master' into blender2.8

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



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