Merge branch 'hotfix/1.1.4'
Improve pre-release matching
Merge branch 'hotfix/1.1.5' into develop

Conflicts:
	cheddar/__init__.py