[Backport] Fixed typo
Merge branch 'master' into stable (v. 1.2.0)