Back button should save tag changes instead of canceling
Merge remote-tracking branch 'upstream/master' into 130122_sb_new_sync