Contrib update: phpass-6.x-2.1
Merge branch 'refs/heads/master' into 2.3.x-dev