Merge branch 'hotfix/1.0.28'
authorAnthony Talarico <talarico@gaslightmedia.com>
Thu, 11 Aug 2016 15:50:17 +0000 (11:50 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Thu, 11 Aug 2016 15:50:17 +0000 (11:50 -0400)

Trivial merge