Merge from original adafruit:master