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

[Bastien Montagne]

Commit: 0b61b53c9c0083d92da656035f0241ff30f79eda
Author: Bastien Montagne
Date:   Fri Oct 7 12:02:41 2016 +0200
Branches: asset-engine
https://developer.blender.org/rB0b61b53c9c0083d92da656035f0241ff30f79eda

Merge branch 'master' into asset-engine

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



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