Upgrade contributed XNAT stuff