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

[Bastien Montagne]

Commit: 655ccef0959dcd70602e5306e30123243b925f37
Author: Bastien Montagne
Date:   Wed Aug 31 20:59:49 2016 +0200
Branches: asset-engine
https://developer.blender.org/rB655ccef0959dcd70602e5306e30123243b925f37

Merge branch 'master' into asset-engine

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



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