Fixed bug introduced by removing encryption.
Merge branch 'master' into gh-pages