Work on 9.2.2
Merge pull request #5 from CdLbB/master

A few small typos found in 7.4-7.6
Merge upstream changes
Work on 9.2.2
Work on 9.2.2
Work on 9.2.2
Work on 9.2.2
Work on 9.2.2
Work on 9.2.2
Work on 9.2.2; need to fix compilation
Work on 9.2.2; still need to fix compilation
Work on 9.2.2
Merge remote-tracking branch 'upstream/master'