Latest changes (including turning '2nd chance' back on in run_test_case.sh because I've fixed the goeloc thing yet)
Bringing up to date.