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

[Bastien Montagne]

Commit: e1c0b2ff2504e797ed28a7996cfa388a3c8ab92b
Author: Bastien Montagne
Date:   Sat Apr 16 15:02:16 2016 +0200
Branches: asset-engine
https://developer.blender.org/rBe1c0b2ff2504e797ed28a7996cfa388a3c8ab92b

Merge branch 'master' into asset-engine

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



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