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

[Bastien Montagne]

Commit: 7c263af84a48c2409ed09974e12b7075c92cae44
Author: Bastien Montagne
Date:   Wed Aug 10 15:18:17 2016 +0200
Branches: asset-engine
https://developer.blender.org/rB7c263af84a48c2409ed09974e12b7075c92cae44

Merge branch 'master' into asset-engine

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



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