Update changelog with work from recent days.
Merge remote-tracking branch 'origin/master'

Conflicts:
	CHANGELOG.asciidoc