tree 8f9496b6d58b910ed8212b2fc3d9fb3b2ee9174f
parent c0f679cbf69d6590d4e4a1120e440b420da23868
parent 18a11ff0abd23c3728ae9dbe5bbe714850b5c348
author Nick Couchman <vnick@apache.org> 1534868158 -0400
committer Nick Couchman <vnick@apache.org> 1534868158 -0400

Merge 1.0.0 changes back to master.