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

[Bastien Montagne]

Commit: 32b7fc143367f86f21c995d8c5bd75a5e2eb320f
Author: Bastien Montagne
Date:   Fri Sep 16 12:24:25 2016 +0200
Branches: asset-engine
https://developer.blender.org/rB32b7fc143367f86f21c995d8c5bd75a5e2eb320f

Merge branch 'master' into asset-engine

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



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