Merge branch 'master' of github.com:juhoen/hybrid-crypto-js # Please…

… enter a commit message to explain why this merge is necessary, # especially if it merges an updated upstream into a topic branch. # # Lines starting with '#' will be ignored, and an empty message aborts # the commit.