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

[Bastien Montagne]

Commit: ae569a4e76968b8905e203f9f1125beb51c17a54
Author: Bastien Montagne
Date:   Thu Jun 18 11:53:14 2015 +0200
Branches: asset-experiments
https://developer.blender.org/rBae569a4e76968b8905e203f9f1125beb51c17a54

Merge branch 'master' into asset-experiments

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



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