Last bit not implemented by a4496b927b Squash and rebase of https://github.com/arduino/Arduino/pull/108
a4496b927b