Updated for latest version of upstream.