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

[Campbell Barton]

Commit: 3143b2f9424a10b1baf960c6a0bbb274cdeffe1d
Author: Campbell Barton
Date:   Wed Dec 20 15:06:22 2017 +1100
Branches: blender2.8
https://developer.blender.org/rB3143b2f9424a10b1baf960c6a0bbb274cdeffe1d

Merge branch 'master' into blender2.8

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



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