tree 05dc6213f000ab9550137abbdbc4348523570d3c
parent 32677d75b6eee0e6f4eac40bf06196e4073eb30d
parent cc2da2ed3b391ecafe55a6f7fab7bd92e379393c
author Nick Couchman <vnick@apache.org> 1539798759 -0400
committer Nick Couchman <vnick@apache.org> 1539798759 -0400

Merge 1.0.0 changes back to master.