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

[Campbell Barton]

Commit: 47f2b3b80d748ccfe1192dbd7c3176be88814da1
Author: Campbell Barton
Date:   Sun May 27 12:54:21 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB47f2b3b80d748ccfe1192dbd7c3176be88814da1

Merge branch 'master' into blender2.8

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



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