Montpellier defender Mapou Yanga-Mbiwa has ended speculation over his future by signing a new deal at the club.