what of English?
Merge branch 'master' into stable