Merge branch 'master' into 0.8
Conflicts: .travis.yml AUTHORS docs/changelog.rst mongoengine/base.py mongoengine/queryset.py tests/queryset/queryset.py
This commit is contained in:
Conflicts: .travis.yml AUTHORS docs/changelog.rst mongoengine/base.py mongoengine/queryset.py tests/queryset/queryset.py