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

[Campbell Barton]

Commit: cd4f925f564a01d96038c83a9d39396e275f71a4
Author: Campbell Barton
Date:   Fri Nov 3 20:59:15 2017 +1100
Branches: blender2.8
https://developer.blender.org/rBcd4f925f564a01d96038c83a9d39396e275f71a4

Merge branch 'master' into blender2.8

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



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