handling stale nginx pidfile a bit better (in theory)
Merge remote-tracking branch 'origin/master'