merging a patch for FB commenting as there was a bug