From: Jay Hannah <jay.hannah@iinteractive.com>
Date: Tue, 16 Jan 2018 22:43:48 +0000 (-0600)
Subject: Merge branch 'pr/154' into release-candidates/rc-5.90116
X-Git-Tag: 5.90116~8
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=commitdiff_plain;h=dddc7ec8cc0e9112ff51caad562a15e3699e3fab;hp=--cc

Merge branch 'pr/154' into release-candidates/rc-5.90116

Conflicts jhannah resolved manually:
  Makefile.PL
  lib/Catalyst.pm
---

dddc7ec8cc0e9112ff51caad562a15e3699e3fab