Parse $*OSVER correctly
Merge commit '7b6e5b785efbaacb4fac991ef683e032286201cc'