Merge branch 'hotfix/1.1.24' v1.1.24
authorAnthony Talarico <talarico@gaslightmedia.com>
Thu, 20 Jul 2017 20:01:09 +0000 (16:01 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Thu, 20 Jul 2017 20:01:09 +0000 (16:01 -0400)

Trivial merge