Imported Upstream version 1.13
Imported Upstream version 1.13
Merge branch 'upstream'

Conflicts:
	README.md
Update changelog