Merge remote-tracking branch 'ba/master'
Merge branch 'master' of https://github.com/diegotheblind/totalfinder-i18n