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

[Campbell Barton]

Commit: c1da6c9d7dd602c961fc5ada4e19266936357950
Author: Campbell Barton
Date:   Fri Nov 3 01:16:10 2017 +1100
Branches: blender2.8
https://developer.blender.org/rBc1da6c9d7dd602c961fc5ada4e19266936357950

Merge branch 'master' into blender2.8

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



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