Fixed trivial style problems.
Merge branch 'next' into daniel_2179