Merge remote-tracking branch 'origin/2.3-gae' into docgen-2.0