Fix another doc comment
Merge remote-tracking branch 'origin/master' into ticket-8