Merging Cloudant branch into master