Merge branch 'i18n-2013' of https://github.com/BashfulBladder/gargoyle into i18n-2013
Merge branch 'i18n-2013' of https://github.com/ssebastianj/gargoyle into i18n-2013