Better Drupal messages.
Merge branch 'change-flagging' into add-to-default