Imported Upstream version 3.6
Merge tag 'upstream/3.6' into experimental

Upstream version 3.6

* tag 'upstream/3.6':
  Imported Upstream version 3.6
changelog header
Support paused (inactive) feeds in r2e-migrate

Signed-off-by: Etienne Millon <me@emillon.org>
Ack patch
r2e-migrate: simplify pause patch
Upload to experimental