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

[Bastien Montagne]

Commit: d02c2018146ae0d5b0766dcd95adf0695fbd0e39
Author: Bastien Montagne
Date:   Wed Dec 16 21:39:49 2015 +0100
Branches: asset-engine
https://developer.blender.org/rBd02c2018146ae0d5b0766dcd95adf0695fbd0e39

Merge branch 'master' into asset-engine

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



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