Merge branch 'master' into prologue-quibbles
Merge branch 'prologue-quibbles'