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

[Bastien Montagne]

Commit: e545d5e21d78a0fe17ad0c2f9ef6dbdbc48e96dd
Author: Bastien Montagne
Date:   Wed Aug 24 18:07:31 2016 +0200
Branches: asset-engine
https://developer.blender.org/rBe545d5e21d78a0fe17ad0c2f9ef6dbdbc48e96dd

Merge branch 'master' into asset-engine

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



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