Merge branch 'master' of https://github.com/juhovh/shairplay into upstream