Done in gae-init pull request, will update in this branch for gae-init-babel also