Merge branch 'hotfix/1.0.7' v1.0.7
authorAnthony Talarico <talarico@gaslightmedia.com>
Thu, 28 Dec 2017 16:36:35 +0000 (11:36 -0500)
committerAnthony Talarico <talarico@gaslightmedia.com>
Thu, 28 Dec 2017 16:36:35 +0000 (11:36 -0500)

Trivial merge