[1.6.x] Replaced instances of 'his/her' with 'their'.

Backport of 8fbf13a6c8 from master