Remove blank line
Fix phpdoc
Merge branch 'master' into oro/grid