Merge branch 'bug/unlink-pidfile'