Merge branch 'hotfix/1.0.28' v1.0.28
authorAnthony Talarico <talarico@gaslightmedia.com>
Mon, 12 Sep 2016 18:10:25 +0000 (14:10 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Mon, 12 Sep 2016 18:10:25 +0000 (14:10 -0400)

Trivial merge