Temporary fix for uptime limiting bug during processing
Merge branch 'master' into gh-pages