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

[Bastien Montagne]

Commit: f2bff41cd5668e233e1f8582cbf9e2b667d5569e
Author: Bastien Montagne
Date:   Tue Mar 3 17:10:30 2015 +0100
Branches: asset-experiments
https://developer.blender.org/rBf2bff41cd5668e233e1f8582cbf9e2b667d5569e

Merge branch 'master' into asset-experiments

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



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