Update thunder to 2.6.1.1484
Merge pull request #4215 from jsfaint/master

Update thunder to 2.6.1.1484