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

[Bastien Montagne]

Commit: 6b1065b11cf87f70dd81683b37ae192aa8594df0
Author: Bastien Montagne
Date:   Wed Jan 20 15:02:49 2016 +0100
Branches: asset-engine
https://developer.blender.org/rB6b1065b11cf87f70dd81683b37ae192aa8594df0

Merge branch 'master' into asset-engine

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



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