tree ab1b92fabb4e0da8385e4d9af9565fa8610b3ce7
parent 1156823bc5ce7c39c4a262bfa504020186550c04
parent 08a08aac066e077087a27f9293c2443caa9e0f96
author Nick Couchman <vnick@apache.org> 1541902624 -0500
committer Nick Couchman <vnick@apache.org> 1541902624 -0500

Merge 1.0.0 changes back to master.