Merge branch 'master' into support-syslogd
Support syslog logging.
Merge branch 'support-syslogd'