sync with upstream. updated to 3.12.0-1