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

[Bastien Montagne]

Commit: 03829f7c4818bd8dac2fa837cd14e53ccb6fc148
Author: Bastien Montagne
Date:   Tue Aug 18 14:35:56 2015 +0200
Branches: asset-experiments
https://developer.blender.org/rB03829f7c4818bd8dac2fa837cd14e53ccb6fc148

Merge branch 'master' into asset-experiments

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



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