clean rebase on current mopidy/debian branch