Merge pull request #16418 from womfoo/pianobar
pianobar: 2015.11.22 -> 2016.06.02
authored by Pascal Wittmann and committed by GitHub 9 years ago c9412ca3 a3072d3a