Merge branch 'hotfix/1.0.2' v1.0.2
authorAnthony Talarico <talarico@gaslightmedia.com>
Mon, 18 Apr 2016 11:55:31 +0000 (07:55 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Mon, 18 Apr 2016 11:55:31 +0000 (07:55 -0400)

Trivial merge