[Bf-blender-cvs] [2a5d077] asset-experiments: Merge branch 'master' into asset-experiments

[Bastien Montagne]

Commit: 2a5d07773e7ed9c9c8322dedc41764728e7a8292
Author: Bastien Montagne
Date:   Fri May 29 09:30:08 2015 +0200
Branches: asset-experiments
https://developer.blender.org/rB2a5d07773e7ed9c9c8322dedc41764728e7a8292

Merge branch 'master' into asset-experiments

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



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