Canal+ raises offer for MultiChoice, plans JSE listing