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

[Campbell Barton]

Commit: d2e70455cf460df2f73fd8594705b425314371e0
Author: Campbell Barton
Date:   Mon Aug 20 17:53:53 2018 +1000
Branches: blender2.8
https://developer.blender.org/rBd2e70455cf460df2f73fd8594705b425314371e0

Merge branch 'master' into blender2.8

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



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