Merge "Made User::touch no longer call load()"