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

[Campbell Barton]

Commit: 14af3e485f1207e8f4ddb6991b22e1ba2f937c45
Author: Campbell Barton
Date:   Mon Oct 16 14:31:19 2017 +1100
Branches: blender2.8
https://developer.blender.org/rB14af3e485f1207e8f4ddb6991b22e1ba2f937c45

Merge branch 'master' into blender2.8

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



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