Improved Linux uptime reading
Merge branch '3.0/develop' into 3.1/develop