Merge osversiondetect changes to production use
I somehow messed up, and asked to merget to Master. Now I understand the Stable branch is the one that is in production use. So please merge my changes to Stable. I checked now and it looks to me Master can be cleanly merged to Stable, and the changes are only my osversiodetect changes.