fix bug #1158
Merge branch 'master' into nestedset-comments-v2