log request uri on exceptions
Merge remote-tracking branch 'origin/master'