Trivial...make all hashes use same hash syntax
Merge remote-tracking branch 'remotes/nahi/master'