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

[Bastien Montagne]

Commit: 77cdf1fb49b3747cbd5edb4f1450ddaa85b8d903
Author: Bastien Montagne
Date:   Tue May 31 09:53:40 2016 +0200
Branches: asset-engine
https://developer.blender.org/rB77cdf1fb49b3747cbd5edb4f1450ddaa85b8d903

Merge branch 'master' into asset-engine

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



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