Merge maint

Merge the maintenance branch into master, using -s ours, so we can merge any commits on maintenance into master later, without getting merge conflicts on the version changes.