mstr2

> I can confirm that this change fixes a Problem for more users. Actually, i have a built with exactly the same change. So if this doesn't break anything, it...

/integrate