Fix #1156
Fix indentation. #1177
Merge branch 'master' of github.com:baudday/pouchdb