Applies patches from flowersinthesand/portal#127 and
flowersinthesand/portal#128