[Bf-blender-cvs] [576eca8] asset-engine: Merge branch 'master' into asset-engine

[Bastien Montagne]

Commit: 576eca8ab3dc0b21622f5e980249ef4f56b6ca9f
Author: Bastien Montagne
Date:   Sun Feb 14 20:27:48 2016 +0100
Branches: asset-engine
https://developer.blender.org/rB576eca8ab3dc0b21622f5e980249ef4f56b6ca9f

Merge branch 'master' into asset-engine

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



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