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

[Bastien Montagne]

Commit: b5c72b15edfad7f2f96c8c135e17d08574687815
Author: Bastien Montagne
Date:   Wed May 13 17:14:46 2015 +0200
Branches: asset-experiments
https://developer.blender.org/rBb5c72b15edfad7f2f96c8c135e17d08574687815

Merge branch 'master' into asset-experiments

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



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