fix bug 902576 - Remove spaces from base template macros
Merge pull request #1264 from darkwing/derby-car-902576-too

fix bug 902576 - Remove spaces from base template macros