Merged Kristofers timanalyt changes from mster