Merge pull request #3578 from MikePetullo/syslog-ng