Some short work on localizing commands. The template has been
discovered!
Merge remote-tracking branch 'upstream/master'