Added accept/reject buttons.
Merge upstream.