Re-synced with official repo.