Make sure to kill child processes
Merge remote-tracking branch 'upstream/master'