Fix two internal paths
Merge remote-tracking branch 'upstream/master'

Conflicts:
	typo/2stage.py