Mental note that we should merge adt-cleanups to master, give pdkdf2 the 'develop' treatment and then update this line.