tree ad5589f6ea8256220015f62105d33428ff8105ce
parent d3206062959cff83223957c1bf98154535baf6a5
parent d23f88f23652b49f1b28784080b26831e0f9ab97
author Nick Couchman <vnick@apache.org> 1536446721 -0400
committer Nick Couchman <vnick@apache.org> 1536446721 -0400

Merge 1.0.0 changes back to master.