bumped 0.4.25
i18n
Merge remote-tracking branch 'upstream/master'