merge 0.1.x to master (0.1.5 `Cinnamon`)