long differ
Merge remote-tracking branch 'mine/master' into make_highlighting_stricter

Conflicts:
	diff.py