Fix subject generation when generating notifications for non forum objects such as blog comments
Merge remote-tracking branch 'origin/1_x' into 1_x