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

[Bastien Montagne]

Commit: 44c099d549a2ae55cc6da07cbfeba89dc2b8a3ab
Author: Bastien Montagne
Date:   Thu Sep 8 12:00:26 2016 +0200
Branches: asset-engine
https://developer.blender.org/rB44c099d549a2ae55cc6da07cbfeba89dc2b8a3ab

Merge branch 'master' into asset-engine

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



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