Merge 1.1.0 changes back to master.
authorVirtually Nick <vnick@apache.org>
Sat, 9 Feb 2019 19:24:49 +0000 (14:24 -0500)
committerVirtually Nick <vnick@apache.org>
Sat, 9 Feb 2019 19:24:49 +0000 (14:24 -0500)

Trivial merge