Upgrade to credentials-1.5