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

[Campbell Barton]

Commit: 7ffd3490a873c162cd6b6a3e7698df3c5869a2f9
Author: Campbell Barton
Date:   Fri Oct 27 13:24:16 2017 +1100
Branches: blender2.8
https://developer.blender.org/rB7ffd3490a873c162cd6b6a3e7698df3c5869a2f9

Merge branch 'master' into blender2.8

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



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