Adjusted format of unique machine name on iOS
Merge branch 'master' into Development