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

[Bastien Montagne]

Commit: 42fa889e46c2f63cf99482b603fbe8d2117ed2c7
Author: Bastien Montagne
Date:   Wed Jul 11 14:56:13 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB42fa889e46c2f63cf99482b603fbe8d2117ed2c7

Merge branch 'master' into blender2.8

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



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