merge 0.1.x (0.1.6 `Wobbegong`)