Merge branch 'request-op-backwards-compat' into maint

* request-op-backwards-compat:
  Fix backwards compat with 1.2/1.3

Conflicts:
	doc/UPDATES
Merge branch 'master' into next

* master:

Conflicts:
	doc/UPDATES