Merge pull request #1576 from McSherry/patch-1