merge 0.2.x (0.2.9 `Screamin Green`)