Merge branch 'master' into develop
case 3697 - Fixed missing value.
case 3726 - Gracefully handle provider errors.
Merge branch 'case-3726' into develop

* case-3726:
  case 3726 - Gracefully handle provider errors.
case 3669 - Do not escape characters when saving query.
Merge branch 'case-3669' into develop
Merge branch 'develop' of github.com:easyting/alma_item_list into develop
case 3697 - Fix undefined cache setting.
Merge branch 'case-3698' of github.com:easyting/alma_item_list into case-3697

Conflicts:
	plugins/content_types/alma_item_list.inc
Merge branch 'case-3697' into develop
Merge branch 'develop'