Merge branch 'hotfix/1.0.2' v1.0.2
authorAnthony Talarico <talarico@gaslightmedia.com>
Tue, 18 Apr 2017 19:27:01 +0000 (15:27 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Tue, 18 Apr 2017 19:27:01 +0000 (15:27 -0400)

Trivial merge