Neuer extends Bayern Munich contract until 2024