Merge branch 'master' into 6.0-to-master

CRM/Activity/BAO/Query.php

CRM/Activity/Form/Activity.php

CRM/Activity/Form/ActivityFilter.php

CRM/Activity/Form/ActivityView.php

CRM/Activity/Page/AJAX.php

CRM/Activity/Selector/Activity.php

CRM/Activity/Selector/Search.php

CRM/Admin/Form/Options.php

CRM/Admin/Form/PaymentProcessor.php

CRM/Admin/Form/Setting/Localization.php

CRM/Admin/Form/Setting/Mail.php

CRM/Admin/Form/Setting/Smtp.php

CRM/Admin/Form/SettingTrait.php

CRM/Admin/Form/WordReplacements.php

CRM/Admin/Page/AJAX.php

CRM/Admin/Page/APIExplorer.php

CRM/Badge/BAO/Badge.php

CRM/Badge/Form/Layout.php

CRM/Batch/BAO/Batch.php

CRM/Batch/Form/Entry.php