Merge branch 'hotfix/1.2.8' v1.2.8
authorAnthony Talarico <talarico@gaslightmedia.com>
Fri, 30 Sep 2016 20:19:49 +0000 (16:19 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Fri, 30 Sep 2016 20:19:49 +0000 (16:19 -0400)

Trivial merge