Merge branch '4.4' into 4.8

# Conflicts:
#	.php_cs.dist
#	.travis.yml
#	calendar-bundle/src/Resources/contao/dca/tl_calendar.php
#	calendar-bundle/src/Resources/contao/dca/tl_calendar_events.php
#	calendar-bundle/src/Resources/contao/dca/tl_calendar_feed.php
#	calendar-bundle/src/Resources/contao/dca/tl_content.php
#	calendar-bundle/src/Resources/contao/dca/tl_layout.php
#	calendar-bundle/src/Resources/contao/modules/ModuleEventMenu.php
#	calendar-bundle/tests/Picker/EventPickerProviderTest.php
#	comments-bundle/src/Resources/contao/classes/Comments.php
#	comments-bundle/src/Resources/contao/dca/tl_comments.php
#	composer.json
#	core-bundle/src/EventListener/DoctrineSchemaListener.php
#	core-bundle/src/Resources/contao/classes/Backend.php
#	core-bundle/src/Resources/contao/classes/DataContainer.php
#	core-bundle/src/Resources/contao/classes/Frontend.php
#	core-bundle/src/Resources/contao/classes/FrontendTemplate.php
#	core-bundle/src/Resources/contao/classes/FrontendUser.php
#	core-bundle/src/Resources/contao/classes/Messages.php
#	core-bundle/src/Resources/contao/classes/StyleSheets.php
#	core-bundle/src/Resources/contao/classes/Theme.php
#	core-bundle/src/Resources/contao/classes/Versions.php
#	core-bundle/src/Resources/contao/controllers/BackendSwitch.php
#	core-bundle/src/Resources/contao/controllers/FrontendCron.php
#	core-bundle/src/Resources/contao/dca/tl_article.php
#	core-bundle/src/Resources/contao/dca/tl_content.php
#	core-bundle/src/Resources/contao/dca/tl_files.php
#	core-bundle/src/Resources/contao/dca/tl_form.php
#	core-bundle/src/Resources/contao/dca/tl_form_field.php
#	core-bundle/src/Resources/contao/dca/tl_image_size.php
#	core-bundle/src/Resources/contao/dca/tl_image_size_item.php
#	core-bundle/src/Resources/contao/dca/tl_layout.php
#	core-bundle/src/Resources/contao/dca/tl_member.php
#	core-bundle/src/Resources/contao/dca/tl_member_group.php
#	core-bundle/src/Resources/contao/dca/tl_module.php
#	core-bundle/src/Resources/contao/dca/tl_page.php
#	core-bundle/src/Resources/contao/dca/tl_session.php
#	core-bundle/src/Resources/contao/dca/tl_style.php
#	core-bundle/src/Resources/contao/dca/tl_style_sheet.php
#	core-bundle/src/Resources/contao/dca/tl_templates.php
#	core-bundle/src/Resources/contao/dca/tl_theme.php
#	core-bundle/src/Resources/contao/dca/tl_undo.php
#	core-bundle/src/Resources/contao/dca/tl_user.php
#	core-bundle/src/Resources/contao/dca/tl_user_group.php
#	core-bundle/src/Resources/contao/drivers/DC_File.php
#	core-bundle/src/Resources/contao/drivers/DC_Folder.php
#	core-bundle/src/Resources/contao/drivers/DC_Table.php
#	core-bundle/src/Resources/contao/elements/ContentDownload.php
#	core-bundle/src/Resources/contao/elements/ContentHyperlink.php
#	core-bundle/src/Resources/contao/elements/ContentMarkdown.php
#	core-bundle/src/Resources/contao/forms/FormCaptcha.php
#	core-bundle/src/Resources/contao/forms/FormCheckBox.php
#	core-bundle/src/Resources/contao/forms/FormFieldset.php
#	core-bundle/src/Resources/contao/forms/FormFileUpload.php
#	core-bundle/src/Resources/contao/forms/FormHidden.php
#	core-bundle/src/Resources/contao/forms/FormPassword.php
#	core-bundle/src/Resources/contao/forms/FormRadioButton.php
#	core-bundle/src/Resources/contao/forms/FormSelectMenu.php
#	core-bundle/src/Resources/contao/forms/FormSubmit.php
#	core-bundle/src/Resources/contao/forms/FormTextArea.php
#	core-bundle/src/Resources/contao/forms/FormTextField.php
#	core-bundle/src/Resources/contao/helper/functions.php
#	core-bundle/src/Resources/contao/library/Contao/Automator.php
#	core-bundle/src/Resources/contao/library/Contao/Combiner.php
#	core-bundle/src/Resources/contao/library/Contao/Config.php
#	core-bundle/src/Resources/contao/library/Contao/Controller.php
#	core-bundle/src/Resources/contao/library/Contao/Database/Installer.php
#	core-bundle/src/Resources/contao/library/Contao/Database/Statement.php
#	core-bundle/src/Resources/contao/library/Contao/Date.php
#	core-bundle/src/Resources/contao/library/Contao/Dbafs.php
#	core-bundle/src/Resources/contao/library/Contao/DcaLoader.php
#	core-bundle/src/Resources/contao/library/Contao/File.php
#	core-bundle/src/Resources/contao/library/Contao/Files.php
#	core-bundle/src/Resources/contao/library/Contao/Filter/SyncExclude.php
#	core-bundle/src/Resources/contao/library/Contao/Image.php
#	core-bundle/src/Resources/contao/library/Contao/Input.php
#	core-bundle/src/Resources/contao/library/Contao/InsertTags.php
#	core-bundle/src/Resources/contao/library/Contao/String.php
#	core-bundle/src/Resources/contao/library/Contao/TemplateInheritance.php
#	core-bundle/src/Resources/contao/library/Contao/User.php
#	core-bundle/src/Resources/contao/library/Contao/Validator.php
#	core-bundle/src/Resources/contao/library/Contao/Widget.php
#	core-bundle/src/Resources/contao/library/Contao/ZipReader.php
#	core-bundle/src/Resources/contao/models/FilesModel.php
#	core-bundle/src/Resources/contao/models/FormModel.php
#	core-bundle/src/Resources/contao/models/PageModel.php
#	core-bundle/src/Resources/contao/models/SessionModel.php
#	core-bundle/src/Resources/contao/modules/ModuleArticle.php
#	core-bundle/src/Resources/contao/modules/ModuleChangePassword.php
#	core-bundle/src/Resources/contao/modules/ModuleFlash.php
#	core-bundle/src/Resources/contao/modules/ModuleSearch.php
#	core-bundle/src/Resources/contao/modules/ModuleUser.php
#	core-bundle/src/Resources/contao/widgets/CheckBox.php
#	core-bundle/src/Resources/contao/widgets/CheckBoxWizard.php
#	core-bundle/src/Resources/contao/widgets/ChmodTable.php
#	core-bundle/src/Resources/contao/widgets/FileSelector.php
#	core-bundle/src/Resources/contao/widgets/FileTree.php
#	core-bundle/src/Resources/contao/widgets/ImageSize.php
#	core-bundle/src/Resources/contao/widgets/InputUnit.php
#	core-bundle/src/Resources/contao/widgets/KeyValueWizard.php
#	core-bundle/src/Resources/contao/widgets/ListWizard.php
#	core-bundle/src/Resources/contao/widgets/ModuleWizard.php
#	core-bundle/src/Resources/contao/widgets/OptionWizard.php
#	core-bundle/src/Resources/contao/widgets/PageSelector.php
#	core-bundle/src/Resources/contao/widgets/PageTree.php
#	core-bundle/src/Resources/contao/widgets/Password.php
#	core-bundle/src/Resources/contao/widgets/RadioButton.php
#	core-bundle/src/Resources/contao/widgets/RadioTable.php
#	core-bundle/src/Resources/contao/widgets/SectionWizard.php
#	core-bundle/src/Resources/contao/widgets/SelectMenu.php
#	core-bundle/src/Resources/contao/widgets/TableWizard.php
#	core-bundle/src/Resources/contao/widgets/TextArea.php
#	core-bundle/src/Resources/contao/widgets/TextField.php
#	core-bundle/src/Resources/contao/widgets/TextStore.php
#	core-bundle/src/Resources/contao/widgets/TimePeriod.php
#	core-bundle/src/Resources/contao/widgets/TrblField.php
#	core-bundle/tests/Command/InstallCommandTest.php
#	core-bundle/tests/Command/SymlinksCommandTest.php
#	core-bundle/tests/Command/UserPasswordCommandTest.php
#	core-bundle/tests/Composer/ScriptHandlerTest.php
#	core-bundle/tests/Contao/ControllerTest.php
#	core-bundle/tests/Contao/SystemTest.php
#	core-bundle/tests/Contao/TemplateTest.php
#	core-bundle/tests/Contao/WidgetTest.php
#	core-bundle/tests/Image/ImageFactoryTest.php
#	core-bundle/tests/Image/ImageSizesTest.php
#	core-bundle/tests/Picker/ArticlePickerProviderTest.php
#	core-bundle/tests/Picker/FilePickerProviderTest.php
#	core-bundle/tests/Picker/PagePickerProviderTest.php
#	core-bundle/tests/Security/ContaoAuthenticatorTest.php
#	faq-bundle/src/Resources/contao/dca/tl_faq.php
#	faq-bundle/src/Resources/contao/dca/tl_faq_category.php
#	faq-bundle/tests/Picker/FaqPickerProviderTest.php
#	manager-bundle/tests/Command/InstallWebDirCommandTest.php
#	manager-bundle/tests/DependencyInjection/ContaoManagerExtensionTest.php
#	monorepo.yml
#	news-bundle/src/Resources/contao/dca/tl_content.php
#	news-bundle/src/Resources/contao/dca/tl_layout.php
#	news-bundle/src/Resources/contao/dca/tl_news.php
#	news-bundle/src/Resources/contao/dca/tl_news_archive.php
#	news-bundle/src/Resources/contao/dca/tl_news_feed.php
#	news-bundle/src/Resources/contao/modules/ModuleNews.php
#	news-bundle/src/Resources/contao/modules/ModuleNewsMenu.php
#	news-bundle/tests/Picker/NewsPickerProviderTest.php
#	newsletter-bundle/src/Resources/contao/classes/Newsletter.php
#	newsletter-bundle/src/Resources/contao/dca/tl_newsletter.php
#	newsletter-bundle/src/Resources/contao/dca/tl_newsletter_channel.php
#	newsletter-bundle/src/Resources/contao/dca/tl_newsletter_recipients.php
#	run

src/Resources/contao/classes/Newsletter.php

@@ -1018,7 +1018,7 @@ public function getSearchablePages($arrPages, $intRoot=0, $blnIsSitemap=false)
 						}
 
 						// The target page is exempt from the sitemap (see #6418)
-						if ($objParent->sitemap == 'map_never')
+						if ($objParent->robots == 'noindex,nofollow')
 						{
 							continue;
 						}