Moved the grenade change to a more appropriate place
Merge remote-tracking branch 'origin/dev'