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

[Campbell Barton]

Commit: 4d2416b99c472c9735e074d864dcf82a85da8c58
Author: Campbell Barton
Date:   Fri Oct 20 00:29:04 2017 +1100
Branches: blender2.8
https://developer.blender.org/rB4d2416b99c472c9735e074d864dcf82a85da8c58

Merge branch 'master' into blender2.8

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



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