Merge branch 'hotfix/1.0.7' v1.0.7
authorAnthony Talarico <talarico@gaslightmedia.com>
Mon, 8 May 2017 17:55:38 +0000 (13:55 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Mon, 8 May 2017 17:55:38 +0000 (13:55 -0400)

Trivial merge