Comment field merge

This is just to make reviewing easier, no need to merge
See 
http://drupal.org/node/1907960 and
http://drupal.org/node/731724