Hilary's commits

Some useful commits from Hilary