Merge commit 'refs/pull/2/head' of https://github.com/apache/freemarker-generator