am 9775eef9: am f1928889: Merge "Remove old version of freemarker" into idea133  Auto-merge: aeb6b01

* commit '9775eef9ece22dfed900945d5a386d07a69ab17d':
  Remove old version of freemarker