Merge branch 'jeffrey-edits' into 'master'

Edits from Jeffrey

See merge request !1
2 jobs for master in 9 seconds (queued for 2 seconds)