comment and whitespace change
Merge branch 'ticket429' into testing