Don't log stack for 4xx.
Merge remote-tracking branch 'origin/master'