* commit '422b2656741520448815b230f7c73ad67a4c4e95': Adapt to underlying changes in the PBKDF2 implementation