Merge proposals dependent on lp:~cole-jk/pictoric/pictoric

lp:~cole-jk/pictoric/pictoric has no merge proposals.