I checked out the 5.7.0-wip branch and ran 'git cherry-pick master..use-phpass' just to see if it would work, and it doesn't look there are any serious merge conflicts.