Merge branch 'hotfix/v0.3.0' into stable
Merge branch 'master' into stable
Update mime-types to 2.0 -- just released

Conflicts:

	ChangeLog
Merge branch 'stable'

Conflicts:
	ChangeLog
Mark v0.4.1 as stable
Merge branch 'stable'

Conflicts:
	ChangeLog
Bump version to v0.4.1
Merge branch 'stable'