Add tools/command-line as template path
Merge remote-tracking branch 'remotes/upstream/master'

Conflicts:
	include.nmml