Upstream: Updates spec to 3.1-apha equivalent mark