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

[Bastien Montagne]

Commit: cddbeaeec82d58de98fd7b4ff3658756dd6151f6
Author: Bastien Montagne
Date:   Mon Dec 14 16:26:49 2015 +0100
Branches: asset-engine
https://developer.blender.org/rBcddbeaeec82d58de98fd7b4ff3658756dd6151f6

Merge branch 'master' into asset-engine

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



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