Merge with gae-init-auth#27