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

[Bastien Montagne]

Commit: 97798c61254a63527d71f8cbaaf0d6e134c6f447
Author: Bastien Montagne
Date:   Thu May 7 19:17:45 2015 +0200
Branches: asset-experiments
https://developer.blender.org/rB97798c61254a63527d71f8cbaaf0d6e134c6f447

Merge branch 'master' into asset-experiments

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



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