Merge branch 'jc/whitespace'