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

[Bastien Montagne]

Commit: e649feea1432ac5c3ca97ea813f9e2d5b4942d64
Author: Bastien Montagne
Date:   Wed Apr 25 10:39:51 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBe649feea1432ac5c3ca97ea813f9e2d5b4942d64

Merge branch 'master' into blender2.8

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



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