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

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