Merge pull request #1 from spotify/master

Merge
Revert "Merge"
Merge pull request #2 from ocadotechnology/revert-1-master

Revert "Merge"