Imported Upstream version 2.0.0-beta
Imported Upstream version 2.0.0-beta
Imported Upstream version 2.0.0-beta
Merge tag 'upstream/2.0.0-beta'

Upstream version 2.0.0-beta

Conflicts:
	.gitignore
Updated changelog