Merge remote-tracking branch 'origin/master'
change timeout to 30sec.