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

[Campbell Barton]

Commit: be403891652a375e5a0ac61b493342ca6d39afb7
Author: Campbell Barton
Date:   Wed Jan 3 23:44:47 2018 +1100
Branches: blender2.8
https://developer.blender.org/rBbe403891652a375e5a0ac61b493342ca6d39afb7

Merge branch 'master' into blender2.8

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



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