Merge pull request #2774 from blogic/oggfwd