Merge branch 'filehandling' into dev
squash: merging nagios changes with upstream branch
Merge branch 'SIGTERM' into dev