Merge proposals dependent on lp://staging/~michael-sheldon/ubuntu-download-manager/fix-1532899

1. fix-1532899
2. Dependent merge proposals