Adjust title of cipher_migrate output
Do not use VirtualLock/Unlock on WinRT or Windows Phone
Merge branch 'master' into ditto