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

[Bastien Montagne]

Commit: 8b81b71cf2d28a0a85fb5db1dc6078acce899aa7
Author: Bastien Montagne
Date:   Mon Apr 4 14:45:52 2016 +0200
Branches: asset-engine
https://developer.blender.org/rB8b81b71cf2d28a0a85fb5db1dc6078acce899aa7

Merge branch 'master' into asset-engine

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



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