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

[Sybren A. Stüvel]

Commit: 10e6da1f2d61b9db7c47257310eb4580aa096c50
Author: Sybren A. Stüvel
Date:   Wed Jan 17 17:47:38 2018 +0100
Branches: blender2.8
https://developer.blender.org/rB10e6da1f2d61b9db7c47257310eb4580aa096c50

Merge branch 'master' into blender2.8

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



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