edunham and steveklabnik update to upstream