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

[Campbell Barton]

Commit: e99094035c493a4e0bcb47b5cb9b1680b0e853c0
Author: Campbell Barton
Date:   Wed Feb 7 15:59:16 2018 +1100
Branches: blender2.8
https://developer.blender.org/rBe99094035c493a4e0bcb47b5cb9b1680b0e853c0

Merge branch 'master' into blender2.8

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



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