Merge branch 'hotfix/1.0.2' v1.0.2
authorAnthony Talarico <talarico@gaslightmedia.com>
Wed, 31 May 2017 16:07:20 +0000 (12:07 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Wed, 31 May 2017 16:07:20 +0000 (12:07 -0400)

Trivial merge