Merge pull request #1275 from Zaaphod/Probe-G20