Merge branch 'master' of git-hp-cameron:iamcam/Sinker
Merge branch 'master' of github.com:iamcam/Sinker
Merge branch 'master' of https://github.com/iamcam/Sinker