Merge pull request #1553 from Azaezel/MRTMangle