Merge pull request #1102 from SolarisFox/patch-4