[Bf-blender-cvs] [204ec48] asset-engine: Merge branch 'master' into asset-engine

[Bastien Montagne]

Commit: 204ec489b81aa34b2ca9d4bec051cbb282b0c770
Author: Bastien Montagne
Date:   Sun Mar 6 14:57:10 2016 +0100
Branches: asset-engine
https://developer.blender.org/rB204ec489b81aa34b2ca9d4bec051cbb282b0c770

Merge branch 'master' into asset-engine

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



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