Merge proposals dependent on lp:~lamothe-deactivatedaccount-deactivatedaccount/gnome-media-player/2.0-abandoned

1. 2.0-abandoned
2. Dependent merge proposals