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

[Julian Eisel]

Commit: 15bcfaa36b0d2a8831a3068f8a45e6d48e880d2e
Author: Julian Eisel
Date:   Sun Apr 9 22:51:38 2017 +0200
Branches: blender2.8
https://developer.blender.org/rB15bcfaa36b0d2a8831a3068f8a45e6d48e880d2e

Merge branch 'master' into blender2.8

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



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