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

[Bastien Montagne]

Commit: d04a0baae7e174a60c37e437035f8b23b1d29e04
Author: Bastien Montagne
Date:   Tue Feb 3 20:45:25 2015 +0100
Branches: asset-experiments
https://developer.blender.org/rBd04a0baae7e174a60c37e437035f8b23b1d29e04

Merge branch 'master' into asset-experiments

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



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