Bug 1094838 — Be consistent on the userMac usage.
Merge pull request #245 from mozilla-services/1094838-userMac-consistency

Bug 1094838 — Be consistent on the userMac usage.