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

[Bastien Montagne]

Commit: 40562d0e111c4b19f5f5437a871846f3a310edd7
Author: Bastien Montagne
Date:   Thu Feb 18 17:35:12 2016 +0100
Branches: asset-engine
https://developer.blender.org/rB40562d0e111c4b19f5f5437a871846f3a310edd7

Merge branch 'master' into asset-engine

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



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