Typo / PhpDoc
Merge branch master into dev
Typo