stepparent

(noun) parent (generic term)