Revert "Merge branch 'master' into feature/adaptive-payments"

This reverts commit fdf10b0f46d348b9725c30fbf3c95f457447a72a, reversing
changes made to aa3d7a028837cccd1bf66d0f7fe4f912c696b701.

Conflicts:
	README.rst
Merge branch 'feature/adaptive-payments' into feature/adaptive-payments_request-tokens