Hedge a little while the compendium of session add-ons is written.
Merge remote-tracking branch 'origin/master'