notes back button bug fix & improve comments accepted answer notice
Merge remote-tracking branch 'origin/master'