Merge branch 'hotfix/1.1.30' v1.1.30
authorAnthony Talarico <talarico@gaslightmedia.com>
Tue, 24 Apr 2018 18:53:04 +0000 (14:53 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Tue, 24 Apr 2018 18:53:04 +0000 (14:53 -0400)

Trivial merge