Merge "Add support for hash-style=gnu"