Changes for i18n and additional formats and fixes from Moo.do.