Merge branch 'hotfix/1.1.30' v1.1.30
authorAnthony Talarico <talarico@gaslightmedia.com>
Tue, 31 Oct 2017 14:08:34 +0000 (10:08 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Tue, 31 Oct 2017 14:08:34 +0000 (10:08 -0400)

Trivial merge