Machine ID should always be a string
Merge pull request #2434 from emyl/machine-id-string

Machine ID should always be a string