Small formatting changes
Merge branch 'master' into HEAD
Merge