Merge branch 'hotfix/1.0.2' v1.0.2
authorAnthony Talarico <talarico@gaslightmedia.com>
Wed, 25 Nov 2015 13:43:36 +0000 (08:43 -0500)
committerAnthony Talarico <talarico@gaslightmedia.com>
Wed, 25 Nov 2015 13:43:36 +0000 (08:43 -0500)

Trivial merge