Merge pull request #574 from rtissera/rpi3_64