Merge pull request #1349 from martinjt/MachineKeyProtect