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

[Campbell Barton]

Commit: 9daf6b12a635504c3a0c677b98450024bedd3ac5
Author: Campbell Barton
Date:   Sun Jul 1 07:24:46 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB9daf6b12a635504c3a0c677b98450024bedd3ac5

Merge branch 'master' into blender2.8

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



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