Merge pull request #7084 from nupplaphil/task/mod_removetag