fixed oom-killer issue 1018
Merge pull request #1056 from galenpospisil/oom-killer

fix oom-killer issue #1018