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

[Bastien Montagne]

Commit: c349b2a5bf32a4e06facf5cb18d7b262b1810fb1
Author: Bastien Montagne
Date:   Wed Aug 10 22:06:45 2016 +0200
Branches: asset-engine
https://developer.blender.org/rBc349b2a5bf32a4e06facf5cb18d7b262b1810fb1

Merge branch 'master' into asset-engine

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



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