Updated to Forge 1121, fixed some typos, fix #1878
Merge pull request #1879 from tambry/forge1093

Update to Forge 1121 and fix 2 typos