Merged with gae-init/gae-init master.