Merge pull request #1835 from adamdmoss/master Pulseaudio: Support 5-channel surround, optional in UI
