Merge proposals dependent on lp:~smartgpx/bzr-explorer/fix-519757

lp:~smartgpx/bzr-explorer/fix-519757 has no merge proposals.