Merge branch 'release/1.1.0' v1.1.0
authorChuck Scott <cscott@gaslightmedia.com>
Fri, 14 Jul 2017 15:52:15 +0000 (11:52 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Fri, 14 Jul 2017 15:52:15 +0000 (11:52 -0400)

Trivial merge