Merge branch 'master' into production

Bring in recent API doc fixes.
Merge branch 'release/1.5.2' into production
Merge tag 'v1.5.2'

1.5.2