merge from Rpi 3.6.y upstream.