Merge branch 'hotfix/1.0.2' v1.0.2
authorAnthony Talarico <talarico@gaslightmedia.com>
Tue, 27 Jun 2017 17:15:11 +0000 (13:15 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Tue, 27 Jun 2017 17:15:11 +0000 (13:15 -0400)

Trivial merge