tree 327fdc5250816199f2579da5e51353ae527461e2
parent 83f8dd50dfbb49ec98ec12607e89aa9e10ac5a27
parent 71f993b25d8942c088c4f174e6aa681b49723c2d
author Michael Jumper <mjumper@apache.org> 1530856476 -0700
committer Michael Jumper <mjumper@apache.org> 1530856476 -0700

Merge 1.0.0 changes back to master.