Merge remote-tracking branch 'upstream/master'

Conflicts:
	slick-
testkit/src/main/scala/com/typesafe/slick/testkit/util/Testkit.scala
	src/main/scala/scala/slick/driver/PostgresDriver.scala