merge 0.2.x (0.2.7 `Cherry Limeade`)