Merge "Add explicit GENDER support for 'revertpage-nouser'"