Pull in latest userland commits