Fixes BH-341
Merge branch 'translation' of https://github.com/PerceptumNL/KhanLatest into translation