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

[Bastien Montagne]

Commit: dbeabcd9533c96ba3ba8f62e823937c0be689dc4
Author: Bastien Montagne
Date:   Tue Sep 13 18:00:40 2016 +0200
Branches: asset-engine
https://developer.blender.org/rBdbeabcd9533c96ba3ba8f62e823937c0be689dc4

Merge branch 'master' into asset-engine

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



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