Merge branch 'hotfix/1.1.30' v1.1.30
authorAnthony Talarico <talarico@gaslightmedia.com>
Wed, 21 Mar 2018 21:00:07 +0000 (17:00 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Wed, 21 Mar 2018 21:00:07 +0000 (17:00 -0400)

Trivial merge