Removed glcdfont references (handled in Adafruit_GFX)
Fix for recent Adafruit_GFX change
Merge remote branch 'upstream/master'