Don't require blank line after inline comment on the right of the code
Merge branch 'master' into in-portal