TRUNK-1906 fixed formatting
Merge branches 'master' and 'TRUNK-1906'