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

[Bastien Montagne]

Commit: 633e3d2545dcc1fa2c6d48289efd635e113b40d9
Author: Bastien Montagne
Date:   Mon Jun 29 14:55:38 2015 +0200
Branches: asset-experiments
https://developer.blender.org/rB633e3d2545dcc1fa2c6d48289efd635e113b40d9

Merge branch 'master' into asset-experiments

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



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