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

[Bastien Montagne]

Commit: c6ab9117447ab65159d2a77f4be734624929c8ef
Author: Bastien Montagne
Date:   Wed Jun 20 14:16:22 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBc6ab9117447ab65159d2a77f4be734624929c8ef

Merge branch 'master' into blender2.8

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



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