Merge branch 'hotfix/1.0.2' v1.0.2
authorAnthony Talarico <talarico@gaslightmedia.com>
Thu, 19 Jan 2017 14:11:12 +0000 (09:11 -0500)
committerAnthony Talarico <talarico@gaslightmedia.com>
Thu, 19 Jan 2017 14:11:12 +0000 (09:11 -0500)

Trivial merge