Fixed bug where non-ascii characters did not work in password_hash
Merged master