Merge "(bug 25277) Moved the space before the dirmark."