Merge pull request #1392 from jp-bennett/patch-1