Merge sbnoemi/max_depth with latest master.

With this merge, max_depth is again working against
recent masters.

Merge remote-tracking branch 'sbnoemi/max_depth'

Conflicts:
	tastypie/fields.py
	tests/related_resource/api/urls.py
	tests/related_resource/tests.py