Bump the version.
Do not search alternatives if a match was found.
Update setup info.
Merge branch 'master' into develop

Conflicts:
	CHANGES.txt
Bump the version.
Bump the version, again.
Update manifest file.