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

[Campbell Barton]

Commit: b661a4d663c3b77a33e39e226dc35c5c4631689b
Author: Campbell Barton
Date:   Wed Jun 20 11:09:07 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBb661a4d663c3b77a33e39e226dc35c5c4631689b

Merge branch 'master' into blender2.8

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



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