
          Merge remote-tracking branch 'origin/3909-logging'

Conflicts:
	configure-syslog.py