integration with groovy+groovlet+template
Merge remote-tracking branch 'origin/master'