Merge 1.0.0 changes back to master.
authorMichael Jumper <mjumper@apache.org>
Wed, 5 Dec 2018 22:40:34 +0000 (14:40 -0800)
committerMichael Jumper <mjumper@apache.org>
Wed, 5 Dec 2018 22:40:34 +0000 (14:40 -0800)

Trivial merge