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

[Julian Eisel]

Commit: 18a96e39ea9318d7cca1d4d0bfc19ad81a6dff34
Author: Julian Eisel
Date:   Fri May 12 15:36:52 2017 +0200
Branches: blender2.8
https://developer.blender.org/rB18a96e39ea9318d7cca1d4d0bfc19ad81a6dff34

Merge branch 'master' into blender2.8

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



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