Merge remote-tracking branch 'remotes/swiftnav/master' into fix_one_click_update

Conflicts:
	scripts/bootload.py
	scripts/serial_link.py
Leftover cruft from merge