Improved explosive barrel test
Merge branch 'master' into Explosives-Demo