Merge remote-tracking branch 'origin/master'

Conflicts:
	Template_macros.txt
	makescript.ps1