Merge pull request #385 from totten/merge-forward