Merge pull request #1317 from Zaaphod/G38.4_G38.5