Merge branch 'master' of https://github.com/Requarks/wiki

README.md

@@ -33,7 +33,7 @@
 
 Wiki.js can run on virtually all platforms where Node.js can (Windows, Mac, Linux, etc.).
 
-- Node.js **6.9.0** or later
+- Node.js **6.11.1** or later
 - MongoDB **3.2** or later
 - Git **2.7.4** or later
 - An empty Git repository (optional)
@@ -55,7 +55,7 @@ Current and upcoming milestones *(major features only, see the [changelog](https
 
 - [x] Color Themes
 - [x] Server-side TeX/MathML rendering
-- [x] Render linebreaks by default (Github style)
+- [x] Render line breaks by default (GitHub style)
 - [x] New Localization: German
 
 ### Beta 14

server/index.js

@@ -266,9 +266,11 @@ bgAgent.on('message', m => {
 // ----------------------------------------
 
 graceful.on('exit', () => {
+  global.winston.info('- SHUTTING DOWN - Terminating Background Agent...')
+  bgAgent.kill()
   global.winston.info('- SHUTTING DOWN - Performing git sync...')
   return global.git.resync().then(() => {
     global.winston.info('- SHUTTING DOWN - Git sync successful. Now safe to exit.')
-    process.kill(process.pid, 'SIGINT')
+    process.exit()
   })
 })