Merge branch 'hotfix/1.1.7' v1.1.7
authorAnthony Talarico <talarico@gaslightmedia.com>
Wed, 7 Mar 2018 16:09:47 +0000 (11:09 -0500)
committerAnthony Talarico <talarico@gaslightmedia.com>
Wed, 7 Mar 2018 16:09:47 +0000 (11:09 -0500)

Trivial merge