2.10.13
Merge pull request #1114 from github/2.10.13

cut a 2.10.13 release
Merge remote-tracking branch 'upstream/master' into fix-mercury-vendor-dirs