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

[Bastien Montagne]

Commit: 85959e8b4a24731d05aac99647b52838cc26a4af
Author: Bastien Montagne
Date:   Wed Feb 24 10:34:50 2016 +0100
Branches: asset-engine
https://developer.blender.org/rB85959e8b4a24731d05aac99647b52838cc26a4af

Merge branch 'master' into asset-engine

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



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