Merge branch 'master' into encryption
Merge pull request #1 from sdeniss/encryption

Merge branch 'master' into encryption