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

[Campbell Barton]

Commit: 58362939906b31fce02b8f9598f4321e83971b7d
Author: Campbell Barton
Date:   Thu Jan 25 22:20:27 2018 +1100
Branches: blender2.8
https://developer.blender.org/rB58362939906b31fce02b8f9598f4321e83971b7d

Merge branch 'master' into blender2.8

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



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