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

[Bastien Montagne]

Commit: 148b3fc212331fab122e421a76ef9af7f70a2a49
Author: Bastien Montagne
Date:   Wed Sep 14 17:20:41 2016 +0200
Branches: asset-engine
https://developer.blender.org/rB148b3fc212331fab122e421a76ef9af7f70a2a49

Merge branch 'master' into asset-engine

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



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