Merge branch 'hotfix/1.1.2'
Match "_" to "-"
Merge branch 'hotfix/1.1.3' into develop

Conflicts:
	cheddar/__init__.py