Merge branch 'hotfix/1.2.30' v1.2.30
authorAnthony Talarico <talarico@gaslightmedia.com>
Thu, 28 Sep 2017 18:53:20 +0000 (14:53 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Thu, 28 Sep 2017 18:53:20 +0000 (14:53 -0400)

Trivial merge