Merge branches 'master' and 'ke' into ke-lua