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

[Bastien Montagne]

Commit: d1b447101204118a6fc3bb22b036b0c06d330502
Author: Bastien Montagne
Date:   Sun Jan 31 15:05:09 2016 +0100
Branches: asset-engine
https://developer.blender.org/rBd1b447101204118a6fc3bb22b036b0c06d330502

Merge branch 'master' into asset-engine

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



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