Merge "PHPDoc: Fix non-carnonical order of elements in phpdoc"