Merge pull request #1893 from huceke/raspberrypi