Merge branch 'hotfix/1.0.54' v1.0.54
authorAnthony Talarico <talarico@gaslightmedia.com>
Fri, 31 Aug 2018 14:46:37 +0000 (10:46 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Fri, 31 Aug 2018 14:46:37 +0000 (10:46 -0400)

Trivial merge