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

[Bastien Montagne]

Commit: bae3805edb3da9650dd81a34e2999209bc052ae0
Author: Bastien Montagne
Date:   Wed May 27 15:44:38 2015 +0200
Branches: asset-experiments
https://developer.blender.org/rBbae3805edb3da9650dd81a34e2999209bc052ae0

Merge branch 'master' into asset-experiments

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



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