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

[Bastien Montagne]

Commit: 521222b545aa5c88c8ac6ba1b4086c329df4b702
Author: Bastien Montagne
Date:   Mon Jul 25 16:42:35 2016 +0200
Branches: asset-engine
https://developer.blender.org/rB521222b545aa5c88c8ac6ba1b4086c329df4b702

Merge branch 'master' into asset-engine

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



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