Merge branch 'master' into 32-overlay-implementation

Pmodules/modulecmd.bash.in

@@ -2734,16 +2734,9 @@ if [[ -n ${PMODULES_ENV} ]]; then
 	eval "$("${base64}" -d <<< "${PMODULES_ENV}" 2>/dev/null)"
 	if [[ -z ${Version} ]] || [[ ${Version} != ${PMODULES_VERSION} ]]; then
 		# the Pmodules version changed!
-		# we save _LMFILES_ and LOADEDMODULES and restore them
-		# later. Otherwise the Pmodules module would not be listed
-		# by module list
-		declare saved_LMFILES_="${_LMFILES_}"
-		declare saved_LOADEDMODULES="${LOADEDMODULES}"
-		pmodules_init
+		declare -g Version="${PMODULES_VERSION}"
 		_init_overlay_vars
-		_LMFILES_="${saved_LMFILES_}"
-		LOADEDMODULES="${saved_LOADEDMODULES}"
-		export_env _LMFILES_ LOADEDMODULES
+		g_env_must_be_saved='yes'
 	fi
 else
 	pmodules_init