Merge remote-tracking branch 'cloudant/issue-703'

Fixes #703