Add tools/scripts/merge-forward
Merge pull request #385 from totten/merge-forward

Add tools/scripts/merge-forward