Added switch to use syslog for error_log
Merge remote-tracking branch 'origin/master'