Merge changes from upstream - integrate base85/bcrypt changes