am dcd3cd29: am 8e9233ec: Merge "Make mark reflect/accept required, it\'s been upstream for a while."

* commit 'dcd3cd29d2fdde80d96eb512495619ad883c79d2':
  Make mark reflect/accept required, it's been upstream for a while.