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

[Campbell Barton]

Commit: 66d18d93c484e36f7ca0e70220adad19cbe2abc3
Author: Campbell Barton
Date:   Tue May 22 17:24:32 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB66d18d93c484e36f7ca0e70220adad19cbe2abc3

Merge branch 'master' into blender2.8

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



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