Fixed bug introduced by removing encryption.
Merge branch 'master' into gh-pages
Further move performance improvements.
Merge branch 'master' into gh-pages
Merge branch 'gh-pages' into cordova