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

[Julian Eisel]

Commit: 2d22092230d70586543970d47afc2f9a51a8304f
Author: Julian Eisel
Date:   Sat May 13 19:35:54 2017 +0200
Branches: blender2.8
https://developer.blender.org/rB2d22092230d70586543970d47afc2f9a51a8304f

Merge branch 'master' into blender2.8

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



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