Merge remote-tracking branch 'origin/maint-0.2.3'

Use the "ours" strategy so that we retain 4aff97cfc796, which maint-0.2.3
just reverted.