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

[Bastien Montagne]

Commit: 861318bbb9f9ab4baec64e07e1e1458c61149849
Author: Bastien Montagne
Date:   Tue May 3 15:32:30 2016 +0200
Branches: asset-engine
https://developer.blender.org/rB861318bbb9f9ab4baec64e07e1e1458c61149849

Merge branch 'master' into asset-engine

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



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