Merged with gae-init master: Auto merge verified accounts (gae-init/gae-init#203).