Merge branch 'hotfix/1.0.2' v1.0.2
authorAnthony Talarico <talarico@gaslightmedia.com>
Thu, 18 May 2017 18:49:51 +0000 (14:49 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Thu, 18 May 2017 18:49:51 +0000 (14:49 -0400)

Trivial merge