Merge branch 'master' into clement-remove-await

Conflicts:
	src/main/scala/com/wajam/nlb/client/SprayConnectionPool.scala