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

[Campbell Barton]

Commit: 08141260ffa619fef1871ccd446b8a59a7b111ca
Author: Campbell Barton
Date:   Thu Nov 2 18:25:47 2017 +1100
Branches: blender2.8
https://developer.blender.org/rB08141260ffa619fef1871ccd446b8a59a7b111ca

Merge branch 'master' into blender2.8

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



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