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

[Bastien Montagne]

Commit: e3d026416cb4ccbd00ecca3c9505b33da06c4ebb
Author: Bastien Montagne
Date:   Wed Sep 7 13:59:40 2016 +0200
Branches: asset-engine
https://developer.blender.org/rBe3d026416cb4ccbd00ecca3c9505b33da06c4ebb

Merge branch 'master' into asset-engine

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



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