Corrected typo.
Merge branch 'v0.11'