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

[Bastien Montagne]

Commit: 77231eeb2f984ee1e4275721b352e34b94872a77
Author: Bastien Montagne
Date:   Mon Nov 2 19:27:48 2015 +0100
Branches: asset-engine
https://developer.blender.org/rB77231eeb2f984ee1e4275721b352e34b94872a77

Merge branch 'master' into asset-engine

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



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