Merge branch 'master' into fa-dev which includes the Persian translation