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

[Bastien Montagne]

Commit: cb926ab6c9199a177b35b56792848cc82680f376
Author: Bastien Montagne
Date:   Sat Apr 9 15:44:26 2016 +0200
Branches: asset-engine
https://developer.blender.org/rBcb926ab6c9199a177b35b56792848cc82680f376

Merge branch 'master' into asset-engine

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



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