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


Trivial merge