Comment field merge

See 
http://drupal.org/node/1907960 and
http://drupal.org/node/731724