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

[Bastien Montagne]

Commit: d63895ee305a1edcb3937d56eaca02fc426da459
Author: Bastien Montagne
Date:   Wed Mar 30 21:39:09 2016 +0200
Branches: asset-engine
https://developer.blender.org/rBd63895ee305a1edcb3937d56eaca02fc426da459

Merge branch 'master' into asset-engine

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



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