Merge branch 'hotfix/1.0.30' v1.0.30
authorAnthony Talarico <talarico@gaslightmedia.com>
Fri, 16 Mar 2018 20:17:32 +0000 (16:17 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Fri, 16 Mar 2018 20:17:32 +0000 (16:17 -0400)

Trivial merge