Merged fix from default stable

Fix for non Pi hardware and virtual Pi's.

Merged with default stable

(0) -300 -100 -30 -10 -3 +3 +10 +30 +100 tip

mercurial