Merge branch '2.3-gae' into 2.3
Merge branch '2.3' of github.com:freemarker/freemarker into 2.3