Fixed conflicts from upstream pull.