Backport the patch for bug 784631
Merge pull request #3 from sfowler/bug-784631

Backport the patch for bug 784631