Oops I didn't notice it before merging..
OK for `~2.1`