// no line breaks in $this->l()
Merge pull request #980 from djfm/development

// no line breaks in $this->l()