Merge branch 'master' of git.shadowcat.co.uk:Catalyst-Runtime into SicilianButtercup
John Napiorkowski [Mon, 13 May 2013 15:17:11 +0000 (11:17 -0400)]

Trivial merge