Reload config on SIGHUP
Merge remote-tracking branch 'upstream/master'