Merge branch 'master' of git.shadowcat.co.uk:Catalyst-Runtime into SicilianButtercup
John Napiorkowski [Fri, 17 May 2013 16:58:30 +0000 (12:58 -0400)]

Trivial merge