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

[Campbell Barton]

Commit: c7c7bfae75e82ee2121be133b3cc4b297146a026
Author: Campbell Barton
Date:   Fri Jul 13 12:22:21 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBc7c7bfae75e82ee2121be133b3cc4b297146a026

Merge branch 'master' into blender2.8

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



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