Commits from edbgon, bobris, and Dr_No squashed and code style changes by Adam Honse <[email protected]>