[Bf-blender-cvs] [49951df] asset-experiments: Merge branch 'master' into asset-experiments

[Bastien Montagne]

Commit: 49951df23d483432babfbd3f79615e2a749000f4
Author: Bastien Montagne
Date:   Thu Apr 2 10:17:11 2015 +0200
Branches: asset-experiments
https://developer.blender.org/rB49951df23d483432babfbd3f79615e2a749000f4

Merge branch 'master' into asset-experiments

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



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