Merge branch 'hotfix-0.9.4'
Bumped version number.
Merge branch 'master' into develop

Conflicts:
	lib/c2s/version.rb