Merged r7611:7614 from jcorgan/gpio into trunk. Adds custom