Merge branch 'wiringpi' into add-key-and-note