[Bf-blender-cvs] [6f57d12e2e4] blender2.8: Merge branch 'master' into blender2.8

[Campbell Barton]

Commit: 6f57d12e2e4a7d0e094bdfeb56cadd752fbe6207
Author: Campbell Barton
Date:   Tue May 8 07:53:48 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB6f57d12e2e4a7d0e094bdfeb56cadd752fbe6207

Merge branch 'master' into blender2.8

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



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