Merge remote-tracking branch 'origin/master' into dl
Merge branch 'dl' of https://github.com/jmesmon/pianobar into dl