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

[Bastien Montagne]

Commit: 80ddd9afd9fa7621cb8e20db13a450c4ff45d143
Author: Bastien Montagne
Date:   Fri Sep 18 16:20:21 2015 +0200
Branches: asset-engine
https://developer.blender.org/rB80ddd9afd9fa7621cb8e20db13a450c4ff45d143

Merge branch 'master' into asset-engine

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



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