Merging changes from the raspberry-pi branch.