[Bf-blender-cvs] [873a87c7e8f] blender2.8: Merge branch 'master' into blender2.8

[Campbell Barton]

Commit: 873a87c7e8f96e3f6785d90144182356b3fef7cd
Author: Campbell Barton
Date:   Tue Jan 16 14:56:03 2018 +1100
Branches: blender2.8
https://developer.blender.org/rB873a87c7e8f96e3f6785d90144182356b3fef7cd

Merge branch 'master' into blender2.8

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



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