v1.0.2-testing.20170530
8e2b2f37 · Merge pull request #16208 from cockroachdb/marc/cherrypick_16203 ·