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

[Bastien Montagne]

Commit: a53e8836785d5275a144adf5962fe441952aaa2a
Author: Bastien Montagne
Date:   Wed Sep 7 09:25:38 2016 +0200
Branches: asset-engine
https://developer.blender.org/rBa53e8836785d5275a144adf5962fe441952aaa2a

Merge branch 'master' into asset-engine

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



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