Version 4.2
Merge remote-tracking branch 'origin/master'

Conflicts:
	changelog.md