Added possibility for custom controllers to handle HTTP errors on their own
Merge remote-tracking branch 'origin/master'