Fixed Redmin issue#583
Merge branch 'redmineIssue583' into 1.18-candidate