Merge.. https://github.com/arduino/Arduino/pull/8607
Merge..
arduino/Arduino#8607