Whitespace and phpdoc cleanup. Formatting xml documents for better readibility
Merge commit '91b5e63e8bd94f01d48458503b3f7bc3c5690dfa' into 1.13