default to localhost for tests, watch COUCH environment variable
Merge remote-tracking branch 'origin/develop' into develop