Merge pull request #1798 from Azaezel/UUID_unmangle