Merge branch 'sh/gpiolib'