Merge branch 'master' into develop
case 2557 - Exported Field UI teaser display.
Merge branch 'case-2557' into develop
Merge branch 'develop'
Release: v1.12
Merge branch 'master' into develop
case 2896 - Migrate data from list_image to page_list_image.
Merge branch 'case-2896' into listimage_fix
case 2906 - Remove page CT list/main image fields programmatically.
Merge branch 'case-2906' into listimage_fix
Merge branch 'listimage_fix' into develop
Merge remote-tracking branch 'origin/listimage_fix'
Merge branch 'develop'
Release: v1.13
Merge branch 'master' into halbib

* master:
  Release: v1.13
  case 2906 - Remove page CT list/main image fields programmatically.
  case 2896 - Migrate data from list_image to page_list_image.
  Release: v1.12
  case 2557 - Exported Field UI teaser display.

Conflicts:
	ding_page.features.field.inc
Case 3220 - Use better strategy to migrate data.