Imported Upstream version 8.1.1
Merge tag 'upstream/8.1.1'

Upstream version 8.1.1

Conflicts:
	readme.md
changelogs