Merge pull request #1490 from rubenk/uuid