Merge pull request #2137 from fplucas/patch-1