1.1.0 prep

Yeah, depends on a function added in 4.2.0