merge commit
Merge branch 'master' of https://github.com/dmerckx/cpl

Conflicts:
	src/handling/Handler.scala