more fixes for dfdf53e2a9faa8f33a8a6a0c9ac090e8e7608a73
Merge remote-tracking branch 'origin/master' into 1.4.5
fix comment form labels