Merge raspberrypi:rpi-3.6.y to rosterloh:rpi-3.6.y