Merge pull request #15402 from telotortium/subsonic
subsonic: 5.3 -> 6.0
Joachim Fasting 9 years ago a6ed726a f2361686