make ready for app engine
manully merged