Merge "Use uname instead of proc/version"