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

[Gaia Clary]

Commit: fabfbaf001e7da12b26ca1acb7c256599be098c1
Author: Gaia Clary
Date:   Thu Apr 19 18:56:09 2018 +0200
Branches: collada
https://developer.blender.org/rBfabfbaf001e7da12b26ca1acb7c256599be098c1

Merge branch 'master' into collada

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



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