Merge branch 'hotfix/1.0.28' v1.0.28
authorAnthony Talarico <talarico@gaslightmedia.com>
Mon, 9 May 2016 19:30:23 +0000 (15:30 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Mon, 9 May 2016 19:30:23 +0000 (15:30 -0400)

Trivial merge