tree 7c1ee1fb815911af3be04cd0ea163f66abd5a4bc
parent d31864a7ed97c64426ee06c63b48f5992a52104a
parent 4f5eb100bb2086622b1f3aaec472d83768b68b32
author Paul Yang <TeBoring@users.noreply.github.com> 1527716442 -0700
committer GitHub <noreply@github.com> 1527716442 -0700
gpgsig -----BEGIN PGP SIGNATURE-----
 
 wsBcBAABCAAQBQJbDxpaCRBK7hj4Ov3rIwAAdHIIAJINXb49QnKoHcZC9ikTJw5b
 I0imBhICosASXdEs770HRVREyD64kYW1ixUXTYV9euTefrR2dbF0k3S8EQcipHcW
 /NFBarEQODSc4XbGcfQVrOIsfoQwxwu8JycPXVedchZB2uhLANywKNPpjg2bOXhY
 6U7HuVOyPi6npSWB6OHGobQyVna05ZzcbBjgCihTNxufDMzsnEMwUPpjOI3ZehSK
 XtelgNtjGxtWRLOcRSjLI/3GqHsdonuBEXn3vnmQAiIVhU26+lRNB0zulsauUonn
 iDCp5EPVyQKp7uVLlRIwuJnpbGvsdmSEXxrw/nQW2e74kYydp4sWg8CAQe9CKfc=
 =tP1Z
 -----END PGP SIGNATURE-----
 

Merge pull request #4702 from TeBoring/3.6.x

Cherry-pick changes into 3.6.x