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

[Campbell Barton]

Commit: d32e4ca70161eb83179e4ebd1dc538afc1b311c1
Author: Campbell Barton
Date:   Mon Jun 25 07:43:51 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBd32e4ca70161eb83179e4ebd1dc538afc1b311c1

Merge branch 'master' into blender2.8

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



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