Merge branch 'hotfix/1.1.28' v1.1.28
authorAnthony Talarico <talarico@gaslightmedia.com>
Thu, 3 Aug 2017 17:32:15 +0000 (13:32 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Thu, 3 Aug 2017 17:32:15 +0000 (13:32 -0400)

Trivial merge