[Bf-blender-cvs] [23b3901057c] blender2.8: Merge branch 'master' into blender2.8

[Brecht Van Lommel]

Commit: 23b3901057c65269710e810845908ab935cefe06
Author: Brecht Van Lommel
Date:   Fri Jun 15 16:32:31 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB23b3901057c65269710e810845908ab935cefe06

Merge branch 'master' into blender2.8

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



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