Champions League holders Bayern Munich have been drawn against PSG in a rematch of last year's final