Pull in changes from ekoeppen's fork.