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

[Bastien Montagne]

Commit: b0f1a9e27fe719632d8b121e0192f2e07b2dfd30
Author: Bastien Montagne
Date:   Wed May 13 12:52:11 2015 +0200
Branches: asset-experiments
https://developer.blender.org/rBb0f1a9e27fe719632d8b121e0192f2e07b2dfd30

Merge branch 'master' into asset-experiments

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



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