Fix spawning the wrong explosive entity when triggered by another explosion
Merge remote-tracking branch 'origin/master'