Contrib updates: display suite, registration, token