Merge branch 'pulseaudio' into 1.0-dev
Merge branch 'pidfile' into 1.0-dev