Merge pull request #873 from dhardy/master

Fixes regarding OsRng move