Merge branch 'release/1.1.0' v1.1.0
authorChuck Scott <cscott@gaslightmedia.com>
Tue, 2 Oct 2018 19:40:41 +0000 (15:40 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Tue, 2 Oct 2018 19:40:41 +0000 (15:40 -0400)

Trivial merge