Merged with gae-init master.