tree 15c989e1c4fb31910843adb0d28e6998e225c052
parent d67efbaf0451bfb9c49ef3dab65efdfee578da63
parent b0da0d16bff24e8307f8e5a4796ca9e50b3f6991
author Michael Jumper <mjumper@apache.org> 1530158673 -0700
committer Michael Jumper <mjumper@apache.org> 1530158673 -0700

Merge 1.0.0 changes back to master.