upstream/5.7+20101128
61ef6a18 · Import upstream patch 20101128 ·