Sync master branch with upstream.