Merge "Fixes bug 4045 by adding dirmarks."