Update templates and editor config for mcp-1.4 and anzlic
Merge remote-tracking branch 'upstream/master'