Merge branch 'hotfix/1.0.2' v1.0.2
authorAnthony Talarico <talarico@gaslightmedia.com>
Mon, 18 Sep 2017 19:59:38 +0000 (15:59 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Mon, 18 Sep 2017 19:59:38 +0000 (15:59 -0400)

Trivial merge