#276, #280 Fix language installation bug
Merge branch 'master' into version2.1