Merge proposals dependent on lp://staging/~jamesodhunt/libnih/typos-2608201

lp://staging/~jamesodhunt/libnih/typos-2608201 has no merge proposals.