Merge remote-tracking branch 'upstream/path' into path

Conflicts:
	pyinstrument/profiler.py
Windows command-line usage
Prepare for PyPI upload
Merge remote-tracking branch 'codelol/path' into develop

Conflicts:
	pyinstrument/profiler.py