Use new String() for Java arguments.
Merge branch 'templates' into vexgreed