[Bf-blender-cvs] [8093c5c] asset-experiments: Merge branch 'master' into asset-experiments

[Bastien Montagne]

Commit: 8093c5c2a8e4c0f6e88127f193d57618ae1a0aa7
Author: Bastien Montagne
Date:   Mon Mar 30 14:59:25 2015 +0200
Branches: asset-experiments
https://developer.blender.org/rB8093c5c2a8e4c0f6e88127f193d57618ae1a0aa7

Merge branch 'master' into asset-experiments

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



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