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

[Julian Eisel]

Commit: 0af93cf1ac276456619fc2e903c52a97fd09b9fb
Author: Julian Eisel
Date:   Thu Jun 1 19:56:11 2017 +0200
Branches: blender2.8
https://developer.blender.org/rB0af93cf1ac276456619fc2e903c52a97fd09b9fb

Merge branch 'master' into blender2.8

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



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