octopi 0.2.0.8, re-add accidentally removed patch, adjusted another patch