Merge proposals dependent on lp://staging/~noskcaj/ubuntu/wily/gnome-music/merge

1. Wily (15.10)
2. merge
3. Dependent merge proposals