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

[Bastien Montagne]

Commit: 53312d1fac826de64a7ff93d8b9e3acbffa7b316
Author: Bastien Montagne
Date:   Mon Aug 10 15:44:20 2015 +0200
Branches: asset-experiments
https://developer.blender.org/rB53312d1fac826de64a7ff93d8b9e3acbffa7b316

Merge branch 'master' into asset-experiments

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



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