Merge branch 'hotfix/1.2.6'
authorAnthony Talarico <talarico@gaslightmedia.com>
Mon, 12 Sep 2016 18:42:39 +0000 (14:42 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Mon, 12 Sep 2016 18:42:39 +0000 (14:42 -0400)

Trivial merge