Merge branch 'hotfix/fix-ci-tests' into release-3.0.0

Conflicts:
	.travis.yml
	docs/book/cookbook/autowiring-routes-and-pipelines.md
	docs/book/cookbook/debug-toolbars.md
	docs/book/cookbook/flash-messengers.md
	docs/book/cookbook/passing-data-between-middleware.md
	docs/book/cookbook/route-specific-pipeline.md
	docs/book/cookbook/setting-locale-depending-routing-parameter.md
	docs/book/cookbook/setting-locale-without-routing-parameter.md
	docs/book/cookbook/using-a-base-path.md
	docs/book/cookbook/using-custom-view-helpers.md
	docs/book/cookbook/using-routed-middleware-class-as-controller.md
	docs/book/cookbook/using-zend-form-view-helpers.md
	docs/book/features/application.md
	docs/book/features/container/aura-di.md
	docs/book/features/container/delegator-factories.md
	docs/book/features/container/factories.md
	docs/book/features/container/intro.md
	docs/book/features/container/pimple.md
	docs/book/features/container/zend-servicemanager.md
	docs/book/features/emitters.md
	docs/book/features/error-handling.md
	docs/book/features/helpers/body-parse.md
	docs/book/features/helpers/content-length.md
	docs/book/features/helpers/intro.md
	docs/book/features/helpers/server-url-helper.md
	docs/book/features/helpers/url-helper.md
	docs/book/features/middleware-types.md
	docs/book/features/middleware/implicit-methods-middleware.md
	docs/book/features/modular-applications.md
	docs/book/features/router/aura.md
	docs/book/features/router/fast-route.md
	docs/book/features/router/interface.md
	docs/book/features/router/intro.md
	docs/book/features/router/piping.md
	docs/book/features/router/uri-generation.md
	docs/book/features/router/zf2.md
	docs/book/features/template/interface.md
	docs/book/features/template/intro.md
	docs/book/features/template/middleware.md
	docs/book/features/template/plates.md
	docs/book/features/template/twig.md
	docs/book/features/template/zend-view.md
	docs/book/getting-started/features.md
	docs/book/getting-started/skeleton.md
	docs/book/getting-started/standalone.md
	docs/book/reference/cli-tooling.md
	docs/book/reference/expressive-projects.md
	docs/book/reference/migration/to-v2.md
	docs/book/reference/usage-examples.md
	docs/book/why-expressive.md

Author: weierophinney