Merge branch 'hotfix/1.0.2' v1.0.2
authorAnthony Talarico <talarico@gaslightmedia.com>
Tue, 4 Oct 2016 16:29:57 +0000 (12:29 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Tue, 4 Oct 2016 16:29:57 +0000 (12:29 -0400)

Trivial merge