Version bump
Merge branch 'master' into wai2

Conflicts:
	wai-handler-launch/wai-handler-launch.cabal