Fixes #3769 Hiding backtrace on login form + error pages
Merge remote-tracking branch 'origin/master'