Merge branch 'hotfix/3.0.4' into develop

Conflicts:
	assets/contao/js/core.js
	assets/mootools/tablesort/js/tablesort-uncompressed.js
	assets/mootools/tablesort/js/tablesort.js
	system/docs/CHANGELOG.md
	system/modules/core/classes/DataContainer.php
	system/modules/core/dca/tl_page.php
	system/modules/core/languages/cs/default.php
	system/modules/core/languages/cs/explain.php
	system/modules/core/languages/cs/tl_layout.php
	system/modules/core/languages/cs/tl_style.php
	system/modules/core/languages/cs/tl_style_sheet.php
	system/modules/core/languages/cs/tl_theme.php
	system/modules/core/languages/da/default.php
	system/modules/core/languages/da/tl_theme.php
	system/modules/core/languages/de/default.php
	system/modules/core/languages/de/tl_theme.php
	system/modules/core/languages/en/default.php
	system/modules/core/languages/en/tl_theme.php
	system/modules/core/languages/es/default.php
	system/modules/core/languages/fa/default.php
	system/modules/core/languages/fr/default.php
	system/modules/core/languages/fr/tl_layout.php
	system/modules/core/languages/fr/tl_theme.php
	system/modules/core/languages/hu/default.php
	system/modules/core/languages/hu/explain.php
	system/modules/core/languages/it/default.php
	system/modules/core/languages/it/tl_theme.php
	system/modules/core/languages/ja/default.php
	system/modules/core/languages/ja/tl_templates.php
	system/modules/core/languages/ja/tl_theme.php
	system/modules/core/languages/lv/default.php
	system/modules/core/languages/nl/default.php
	system/modules/core/languages/nl/modules.php
	system/modules/core/languages/nl/tl_layout.php
	system/modules/core/languages/nl/tl_theme.php
	system/modules/core/languages/pl/default.php
	system/modules/core/languages/pl/tl_content.php
	system/modules/core/languages/pl/tl_theme.php
	system/modules/core/languages/rm/default.php
	system/modules/core/languages/rm/tl_layout.php
	system/modules/core/languages/rm/tl_page.php
	system/modules/core/languages/ro/default.php
	system/modules/core/languages/ru/default.php
	system/modules/core/languages/ru/tl_theme.php
	system/modules/core/languages/sk/default.php
	system/modules/core/languages/sk/tl_theme.php
	system/modules/core/languages/sl/default.php
	system/modules/core/languages/sv/default.php
	system/modules/core/languages/uk/default.php
	system/modules/core/languages/uk/tl_theme.php
	system/modules/core/modules/ModulePersonalData.php
	system/modules/core/modules/ModuleRegistration.php
	system/modules/core/templates/be_files.html5
	system/modules/core/templates/be_install.html5
	system/modules/core/templates/be_main.html5
	system/modules/core/templates/be_switch.html5
	system/modules/core/templates/be_wildcard.html5
	system/modules/listing/languages/nl/tl_module.php
	system/modules/repository/classes/RepositorySettings.php
	system/themes/default/basic.css
	system/themes/default/fonts.css
	system/themes/default/main.css
	system/themes/default/src/main.css

Author: leofeyer

assets/contao/js/core-uncompressed.js

@@ -832,7 +832,7 @@ var Backend =
 	 * Get the current scroll offset and store it in a cookie
 	 */
 	getScrollOffset: function() {
-		document.cookie = "BE_PAGE_OFFSET=" + window.getScroll().y + "; path=/";
+		document.cookie = "BE_PAGE_OFFSET=" + window.getScroll().y + "; path=" + (Contao.path || '/');
 	},
 
 	/**