merge 0.3.x (0.3.1 `Dotted Mushroom`)