Merge proposals dependent on lp://qastaging/~mfisch/nano/update_to_2.3.1_try2

lp://qastaging/~mfisch/nano/update_to_2.3.1_try2 has no merge proposals.