Fix problems with whitespace in IE8.

@bug W-2087000@

@rev fabbott@
Merging origin/goliver/master-pending-fix-ie8-whitespace into master