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

[Bastien Montagne]

Commit: 05017bc9a3d3104a5670cc99c10e01b7169b7221
Author: Bastien Montagne
Date:   Sat Jul 4 12:59:37 2015 +0200
Branches: asset-experiments
https://developer.blender.org/rB05017bc9a3d3104a5670cc99c10e01b7169b7221

Merge branch 'master' into asset-experiments

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



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