Merge remote-tracking branch 'adafruit/10.2.x' into merge-from-10.2.x