Update tag editor, restore some rcm-edit bits
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge pull request #221 from jerv13/master

Update tag editor, restore some rcm-edit bits