upstream/1.0.7
520f89af · Merge tag '1.0.7' into upstream/1.0.x ·