Merge proposals dependent on lp:shiki-colors-pkg

lp:shiki-colors-pkg has no merge proposals.