Port some changes from Stefan Koegl and Numerodix's tree.
Port some changes from Stefan Koegl and Numerodix's tree.

theju/django-couchdb-utils,stefankoegl/django-couchdb-utils,stefankoegl/django-couchdb-utils,theju/django-couchdb-utils,stefankoegl/django-couchdb-utils