Merge branch 'couchdb-2992' master
authorNick Vatamaniuc <vatamane@apache.org>
Thu, 16 Mar 2017 02:39:31 +0000 (22:39 -0400)
committerNick Vatamaniuc <vatamane@apache.org>
Thu, 16 Mar 2017 02:39:31 +0000 (22:39 -0400)
Closes #91


Trivial merge