Merge branch 'hotfix/1.0.2' v1.0.2
authorAnthony Talarico <talarico@gaslightmedia.com>
Wed, 24 May 2017 19:30:32 +0000 (15:30 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Wed, 24 May 2017 19:30:32 +0000 (15:30 -0400)

Trivial merge