[Bf-blender-cvs] [11c6fed] asset-engine: Merge branch 'master' into asset-engine

[Bastien Montagne]

Commit: 11c6fed3eea103b382ba3bf715a43122e4a86256
Author: Bastien Montagne
Date:   Tue Feb 2 14:10:27 2016 +0100
Branches: asset-engine
https://developer.blender.org/rB11c6fed3eea103b382ba3bf715a43122e4a86256

Merge branch 'master' into asset-engine

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



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