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

[Campbell Barton]

Commit: 402486ea7bc52f669bc02a00c5e2703590361409
Author: Campbell Barton
Date:   Mon Mar 19 18:18:49 2018 +0100
Branches: blender2.8
https://developer.blender.org/rB402486ea7bc52f669bc02a00c5e2703590361409

Merge branch 'master' into blender2.8

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



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