Merge remote-tracking branch 'upstream/master'

Conflicts:
	README
	gui/qt/lite_window.py