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

[Campbell Barton]

Commit: 504cbc1954d20abd4271eb3fb9820111b7ad14f4
Author: Campbell Barton
Date:   Wed May 23 07:30:50 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB504cbc1954d20abd4271eb3fb9820111b7ad14f4

Merge branch 'master' into blender2.8

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



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