Fixed a problem with the merge

Fixed a compile problem with latest merge. Need to remember to restart
arduino-ide after merges...