Merge branch 'release/1.1.0' v1.1.0
authorChuck Scott <cscott@gaslightmedia.com>
Mon, 25 Jul 2016 21:07:16 +0000 (17:07 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Mon, 25 Jul 2016 21:07:16 +0000 (17:07 -0400)

Trivial merge