Syncing with upstream

The version of code in folsom is very old, and that last pull is likely from an old tag.