Merge branch 'master' into preload

* master:
  Don't wrap php_module_shutdown() with zend_try. executor_globals are released in ZTS build, and this leads to crash.
  [ci skip] Fix indentation in UPGRADING.

Author: dstogov

sapi/phpdbg/phpdbg.c

@@ -2157,9 +2157,7 @@ int main(int argc, char **argv) /* {{{ */
 
 		zend_hash_destroy(&PHPDBG_G(file_sources));
 
-		zend_try {
-			php_module_shutdown();
-		} zend_end_try();
+		php_module_shutdown();
 
 #ifndef _WIN32
 		/* force override (no zend_signals) to prevent crashes due to signal recursion in SIGSEGV/SIGBUS handlers */