Merge branch 'hotfix/1.1.2' v1.1.2
authorChuck Scott <cscott@gaslightmedia.com>
Mon, 7 Aug 2017 18:07:19 +0000 (14:07 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Mon, 7 Aug 2017 18:07:19 +0000 (14:07 -0400)

Trivial merge