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

[Campbell Barton]

Commit: bd3fe54b0d1fae577813d1b2850d5da57dbb1fe5
Author: Campbell Barton
Date:   Tue Jun 19 08:15:03 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBbd3fe54b0d1fae577813d1b2850d5da57dbb1fe5

Merge branch 'master' into blender2.8

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



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