Merge remote-tracking branch 'steve/master'
Merge remote-tracking branch 'steve/master'
Merge branch 'master' of github.com:malloch/liblo