Merge branch 'hotfix/1.2.9'
authorAnthony Talarico <talarico@gaslightmedia.com>
Fri, 30 Sep 2016 20:22:23 +0000 (16:22 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Fri, 30 Sep 2016 20:22:23 +0000 (16:22 -0400)

Trivial merge