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

[Bastien Montagne]

Commit: f346687ef23118cdaf2556f00b1326114ab09a93
Author: Bastien Montagne
Date:   Wed Aug 31 10:17:05 2016 +0200
Branches: asset-engine
https://developer.blender.org/rBf346687ef23118cdaf2556f00b1326114ab09a93

Merge branch 'master' into asset-engine

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



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