Merged recent changes from base repo. (Commits from previous pull request include documentation additions and template-related replacement macro removals.)

[gitelope]

The differences were trivial. First time I've resolved merge conflicts so fingers crossed and apologies in advance for any screw-ups.