Merging in the changes to pyrax settings and identity handling.