fixes #805
Merge branch 'master' of https://github.com/Tjatse/PM2 into development