Merge "Lots of spelling mistakes and phpdoc attributes"