-- <uptime> tag on one line only
Merge branch 'master' into develop