Fix back button in comments view
Merge remote-tracking branch 'origin/master'