Merging updates between st-andrews and github copies.