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

[Campbell Barton]

Commit: e4c9cf7088583353670e9783e0b0aecdf2a0c8df
Author: Campbell Barton
Date:   Thu Feb 1 14:02:33 2018 +1100
Branches: blender2.8
https://developer.blender.org/rBe4c9cf7088583353670e9783e0b0aecdf2a0c8df

Merge branch 'master' into blender2.8

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



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