Merge branch 'sh-pidfile'