Merge branch 'hotfix/1.2.24' v1.2.24
authorAnthony Talarico <talarico@gaslightmedia.com>
Mon, 26 Feb 2018 12:58:42 +0000 (07:58 -0500)
committerAnthony Talarico <talarico@gaslightmedia.com>
Mon, 26 Feb 2018 12:58:42 +0000 (07:58 -0500)

Trivial merge