[Bf-blender-cvs] [5712653f80f] collada: Merge branch 'master' into collada

[Gaia Clary]

Commit: 5712653f80fde4f9390cc6569367827b3f26feea
Author: Gaia Clary
Date:   Tue Apr 17 12:35:32 2018 +0200
Branches: collada
https://developer.blender.org/rB5712653f80fde4f9390cc6569367827b3f26feea

Merge branch 'master' into collada

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



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