lower timeout so script fails in reasonable time
Merge branch 'master' pi changes -> master