Merge remote-tracking branch 'upstream/master' into hedwig34
Fix changes not showing up until scrolled
Merge branch 'hedwig34' of gitbox:Subsonic into hedwig34
Merge remote-tracking branch 'upstream/master' into hedwig34