Merge branch 'hotfix/1.0.2' v1.0.2
authorAnthony Talarico <talarico@gaslightmedia.com>
Thu, 20 Apr 2017 14:45:01 +0000 (10:45 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Thu, 20 Apr 2017 14:45:01 +0000 (10:45 -0400)

Trivial merge