Pull in fixes for #34