code format
fixed
Merge branch 'mantis#1072' into development