Merge branch 'master' of github.com:lastfm/lastcommons-test