Merge branch 'hotfix/1.0.7'
authorAnthony Talarico <talarico@gaslightmedia.com>
Mon, 11 Jul 2016 19:58:54 +0000 (15:58 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Mon, 11 Jul 2016 19:58:54 +0000 (15:58 -0400)

Trivial merge