Germany international Thomas Muller has agreed a two-year contract extension with Bundesliga leaders Bayern Munich.