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

[Luca Rood]

Commit: bdeeb29482af2ab44e03e4681eb079bdcff82b21
Author: Luca Rood
Date:   Wed Jul 5 15:50:01 2017 +0200
Branches: blender2.8
https://developer.blender.org/rBbdeeb29482af2ab44e03e4681eb079bdcff82b21

Merge branch 'master' into blender2.8

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



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