Merge proposals dependent on lp://staging/~binli/ubuntu/vivid/pulseaudio/fix-atoi

1. Vivid (15.04)
2. fix-atoi
3. Dependent merge proposals