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

[Campbell Barton]

Commit: 112540da62cefbf8774a20043cf981664bc2d028
Author: Campbell Barton
Date:   Sat Apr 21 20:17:41 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB112540da62cefbf8774a20043cf981664bc2d028

Merge branch 'master' into blender2.8

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



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