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

[Campbell Barton]

Commit: 7a0750016e7b7f831dd9cbcd14ee12979159ce78
Author: Campbell Barton
Date:   Tue Jul 3 07:23:15 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB7a0750016e7b7f831dd9cbcd14ee12979159ce78

Merge branch 'master' into blender2.8

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



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