Merge pull request #425 from spotify/master