Fixes: Won't compile on AppEngine #67
Merge remote-tracking branch 'mvitorino/master'