Merge "Make password history hashing more secure" into pi-dev