Bugfix: Web Browser back button
Merge remote-tracking branch 'origin'