Merged with gae-init-oauth