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

[Campbell Barton]

Commit: b167bc2f008522427deab016ca0fd55b01920abf
Author: Campbell Barton
Date:   Fri May 18 13:45:48 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBb167bc2f008522427deab016ca0fd55b01920abf

Merge branch 'master' into blender2.8

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



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