Added timeout as an option to various scripts.
Merge branch 'master' into wc