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

[Campbell Barton]

Commit: 0e35c900d82f8a5ef173c5d1c8e0170975f9a94d
Author: Campbell Barton
Date:   Sat Oct 14 17:58:29 2017 +1100
Branches: blender2.8
https://developer.blender.org/rB0e35c900d82f8a5ef173c5d1c8e0170975f9a94d

Merge branch 'master' into blender2.8

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



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