Merge remote-tracking branch 'stable/linux-4.1.y' into rpi-4.1.y