fixed typo
Merge branch 'master' into linda-stable