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

[Bastien Montagne]

Commit: a2a3e40cf13f33e459a88803ed73766723b77681
Author: Bastien Montagne
Date:   Mon Aug 10 15:10:16 2015 +0200
Branches: asset-experiments
https://developer.blender.org/rBa2a3e40cf13f33e459a88803ed73766723b77681

Merge branch 'master' into asset-experiments

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



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