Merge remote-tracking branch 'upstream/master' into proposed-master

Conflicts:
	.gitignore
	hdlmake
	src/srcfile.py