Merge branch 'hotfix/1.0.7' master v1.0.7
authorAnthony Talarico <talarico@gaslightmedia.com>
Wed, 7 Mar 2018 19:48:54 +0000 (14:48 -0500)
committerAnthony Talarico <talarico@gaslightmedia.com>
Wed, 7 Mar 2018 19:48:54 +0000 (14:48 -0500)

Trivial merge