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

[Campbell Barton]

Commit: e4b68befa2eb26df7114507f41102a60b5d38fe7
Author: Campbell Barton
Date:   Wed Aug 8 17:56:56 2018 +1000
Branches: blender2.8
https://developer.blender.org/rBe4b68befa2eb26df7114507f41102a60b5d38fe7

Merge branch 'master' into blender2.8

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



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