Merge in the changes from Stuart's branch (crosses repositories)