=str - #16048 - Switches to pattern-matching iso getOrElse to avoid allocation in ThunkTab and Flow.apply
+htp #15932 integrate SchemeDirectives from spray codebase
Merge pull request #15982 from bthuillier/release-2.3-dev

+htp #15932 Import SchemeDirectives from spray
Merge pull request #16059 from akka/wip-16048-avoid-thunks-√

=str - #16048 - Switches to pattern-matching iso getOrElse to avoid allo...
+str #16038 Create Source/Flow/Sink from partial flow graphs
Merge pull request #16061 from akka/wip-graphs-as-source-flow-sink-ban

+str #16038 Create Source/Flow/Sink from partial flow graphs
First sketch of flexible merge
+str #15079 Add flexible merge
Merge pull request #16052 from akka/wip-15079-flexi-merge-patriknw

+str #15079 Add flexible merge
!htc #15726: Akka HTTP with the new DSL
Merge pull request #16049 from drewhk/wip-15716-akka-http-dsl2

!htc #15716: Akka HTTP with the new DSL
Merge with move of HTTP to new Flow API

Conflicts:
	akka-http-core/src/main/scala/akka/http/model/HttpEntity.scala