redirect STDERR to error.log
Merge remote-tracking branch 'origin/master'