Undefined Gender
Hugo
Merge pull request #1260 from waveney/wav31

Hugo
Merge pull request #1261 from eternaldensity/master

Hugo