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

[Bastien Montagne]

Commit: ec99859c44e2fdd0438e545721b562f9eb52c6b6
Author: Bastien Montagne
Date:   Wed Sep 9 17:20:14 2015 +0200
Branches: asset-experiments
https://developer.blender.org/rBec99859c44e2fdd0438e545721b562f9eb52c6b6

Merge branch 'master' into asset-experiments

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



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