Fix handling of deeply nested documents.
Merge branch 'save_options'

Conflicts:
	spec/support/models.rb