Fixes resolving to db_field from class field name, in distinct() query.
Merge conflicts resolved.
Removed merge trackers in code, merged correctly now.
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Corrected spelling mistakes, some grammar, and UUID/DecimalField error in upgrade.rst
dereference instance not thread-safe
Docs update #406
Docs update #406
Merge pull request #409 from bool-dev/master

Corrected mistakes in upgrade.rst documentation
Create test case for failing saves (wrong delta) with dbref=False
Add asserts to `test_delta_with_dbref_*`, instead of relying on exceptions
Fix `BaseDocument._delta` when working with plain ObjectIds instead of DBRefs
Replace `assertIn` with an `assertTrue`; apparently missing in Python 2.6
Allow args and kwargs to be passed through to_json (#420)
Merge branch 'master' of github.com:MongoEngine/mongoengine
to_json test updates #420
Merge pull request #417 from ProgressiveCompany/delta-dbref-false-bug

BaseDocument._delta doesn't properly end it's path at Documents when using `dbref=False`
Updating changelog and authors #417
Don't follow references in _get_changed_fields (#422, #417)

A better fix so we dont follow down a references rabbit hole.