Merge branch 'master' of https://github.com/simonamor/catalyst-runtime into simonamor...
John Napiorkowski [Mon, 1 May 2017 15:41:49 +0000 (10:41 -0500)]

Trivial merge