Merge branch 'rpi-3.9.y' into rpi-3.9.y+rmh-fbtft