QuickFix!
Merge pull request #3481 from Steelpoint/QuickFix!

[MAP/BOX] Minor Bug Fix: Merge Post Haste!