This is gp24.tex.
Merge remote-tracking branch 'origin/master'