[Bf-blender-cvs] [7f591df840b] collada: Merge branch 'master' into collada

[Gaia Clary]

Commit: 7f591df840b4f5c17537283b39b2656c79928b57
Author: Gaia Clary
Date:   Tue Apr 17 22:37:52 2018 +0200
Branches: collada
https://developer.blender.org/rB7f591df840b4f5c17537283b39b2656c79928b57

Merge branch 'master' into collada

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



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