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

[Bastien Montagne]

Commit: 9fc2d1e35bf24b95acb119ed9530a13cd67ed3c1
Author: Bastien Montagne
Date:   Tue Aug 18 13:24:09 2015 +0200
Branches: asset-experiments
https://developer.blender.org/rB9fc2d1e35bf24b95acb119ed9530a13cd67ed3c1

Merge branch 'master' into asset-experiments

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



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