Merge pull request #1393 from jp-bennett/patch-2