Merge branch 'hotfix/1.1.24' v1.1.24
authorAnthony Talarico <talarico@gaslightmedia.com>
Thu, 13 Jul 2017 15:43:21 +0000 (11:43 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Thu, 13 Jul 2017 15:43:21 +0000 (11:43 -0400)

Trivial merge