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

[Campbell Barton]

Commit: 05f2caa2108f975f0ac1ed01d54e3602430562c2
Author: Campbell Barton
Date:   Thu Oct 25 12:26:08 2018 +1100
Branches: blender2.8
https://developer.blender.org/rB05f2caa2108f975f0ac1ed01d54e3602430562c2

Merge branch 'master' into blender2.8

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



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