Merge proposals

paulus.h has no merge proposals.