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

[Bastien Montagne]

Commit: a0803fabfec7c637ae6390c39be821d85d6f6f53
Author: Bastien Montagne
Date:   Fri Jan 15 16:24:55 2016 +0100
Branches: asset-engine
https://developer.blender.org/rBa0803fabfec7c637ae6390c39be821d85d6f6f53

Merge branch 'master' into asset-engine

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



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