Merge branch 'static-middleware' into 'master'
Change check to only swap static middleware when it's enabled. Fixes problem with #1553. cc @marin See merge request !1565
Change check to only swap static middleware when it's enabled. Fixes problem with #1553. cc @marin See merge request !1565