Merge branch 'hotfix/1.2.55' v1.2.55
authorAnthony Talarico <talarico@gaslightmedia.com>
Wed, 13 Mar 2019 19:35:51 +0000 (15:35 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Wed, 13 Mar 2019 19:35:51 +0000 (15:35 -0400)

Trivial merge