ping

and can you re-create this PR against the 1.0 branch please? @WouterJ that would make more sense than cherry-picking, right?