Merge branch 'hotfix/1.0.2'
authorAnthony Talarico <talarico@gaslightmedia.com>
Fri, 8 Apr 2016 14:45:22 +0000 (10:45 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Fri, 8 Apr 2016 14:45:22 +0000 (10:45 -0400)

Trivial merge