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

[Campbell Barton]

Commit: 1c0905be0f6c36524adeb43237d9541bb1e6dc1e
Author: Campbell Barton
Date:   Fri Dec 8 00:21:54 2017 +1100
Branches: blender2.8
https://developer.blender.org/rB1c0905be0f6c36524adeb43237d9541bb1e6dc1e

Merge branch 'master' into blender2.8

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



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