Merge branch 'cz8s/couchdb_scripts-master'
authorelijah <elijah@riseup.net>
Mon, 20 Jun 2016 17:14:43 +0000 (10:14 -0700)
committerelijah <elijah@riseup.net>
Mon, 20 Jun 2016 17:14:43 +0000 (10:14 -0700)

Trivial merge