GAE support improvements - please merge