merge 0.1.x (0.1.3 `Lefteye Flounder`)