Merge branch 'hotfix/1.1.1' v1.1.1
authorChuck Scott <cscott@gaslightmedia.com>
Mon, 7 Aug 2017 16:29:51 +0000 (12:29 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Mon, 7 Aug 2017 16:29:51 +0000 (12:29 -0400)

Trivial merge