Pull in change original authors used to fix their issues 38 and 32.