Merge branch 'jeffrey-edits' into 'master'

Edits from Jeffrey

See merge request !1
2 jobs for master in 9 seconds (queued for 2 seconds)
Status Name Job ID Coverage
  Deploy
passed pages #20498

00:00:09

passed pages:deploy

00:00:03