Conflicts:

	content.module

Issue #998494 by zhangtaihao: Fix Node Reference field always displaying 10 results when using the Advanced View option (Views 6.x-3.x compatibility).

Conflicts:

	CHANGELOG.txt

Issue #1401950 by KarenS, Add empty test module with dependency on schema to make schema available to testbot.

Issue #1081072 Imagefield validation does not use error_element, needs a tweak so that the empty required field gets highlighted correctly.

Issue #1081072 Imagefield validation requires that we alter the field_info values or it will still require an image in an empty group.

Issue #1093928 Required option lists do not have an empty option available. Add one to avoid 'An illegal choice has been detected' errors for empty groups.

- Fix warning: Creating default object from empty value in template_preprocess_content_display_overview_form() (line 134 of ..theme.inc).

- Fix warning: Creating default object from empty value in template_preprocess_content_display_overview_form() (line 134 of ..theme.inc).

Issue #1081072 Must be able to save empty, non-required, multigroup, even if it contains required fields. Issue #522564 Remove empty groups even if not marked 'remove'.

Issue #1092044 Make sure all multigroup formats are preserved, even if not visible on the current tab.

#766734 Restructure multigroup field layout to be consistent with other fieldgroups, and use content_get_nested_elements() to grab the right values no matter how the fields are structured.

#730154 Remove patch included in nested fieldgroups patch to try to force this error to show up so we can fix it.