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

[Bastien Montagne]

Commit: c20cc3cf14be322f76db5f76d273b55408233802
Author: Bastien Montagne
Date:   Thu May 10 14:27:24 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBc20cc3cf14be322f76db5f76d273b55408233802

Merge branch 'master' into blender2.8

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



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