closes #1285
Merge remote-tracking branch 'origin/master' into templates.js-merge