Merge branch 'hotfix/1.5.20' v1.5.20
authorAnthony Talarico <talarico@gaslightmedia.com>
Thu, 19 Apr 2018 13:16:18 +0000 (09:16 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Thu, 19 Apr 2018 13:16:18 +0000 (09:16 -0400)

Trivial merge