Fix typo.
Merge branch 'release/1.6' into develop