Merge branch 'master', remote branch 'origin'
Critical bug fix in code formatting test
Removing debug statement.
Heavy reformatting.