Change std.???? rule to a more strict one in d files
Merge branch 'master' into mbp15