Merge "Remove old version of freemarker" into idea133