Fix typo in doc string.
Merge remote branch 'upstream/master'