upstream/1.2.6
fd6b67ac · Merge tag '1.2.6' into upstream/1.2.x ·