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

[Bastien Montagne]

Commit: d6b5f82baebf0baf3faa15e12e567c14d79c5195
Author: Bastien Montagne
Date:   Wed Jun 17 14:28:24 2015 +0200
Branches: asset-experiments
https://developer.blender.org/rBd6b5f82baebf0baf3faa15e12e567c14d79c5195

Merge branch 'master' into asset-experiments

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



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