Merge master into echonest-integration branch