Merge "Fix PHPDoc"