Merge branch 'hotfix/1.0.2' v1.0.2
authorAnthony Talarico <talarico@gaslightmedia.com>
Fri, 27 May 2016 20:37:37 +0000 (16:37 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Fri, 27 May 2016 20:37:37 +0000 (16:37 -0400)

Trivial merge