Merge branch 'COUCHDB-1380-fix-nasty-error' of github.com:cloudant/couchdb-config