Merge proposals dependent on lp:~danielholm/joyce/joyce-doc

lp:~danielholm/joyce/joyce-doc has no merge proposals.