* commit '1efc6e52d65389463ad52c32df02d68493df0f48': Adapt to underlying changes in the PBKDF2 implementation