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

[Campbell Barton]

Commit: 4063c7062a325b611a4a74d42198d06dc22cc26a
Author: Campbell Barton
Date:   Thu Oct 26 16:20:34 2017 +1100
Branches: blender2.8
https://developer.blender.org/rB4063c7062a325b611a4a74d42198d06dc22cc26a

Merge branch 'master' into blender2.8

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



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