Centre
Merge pull request #197 from pleroy/OED

Centre
Why were these even there?
After pleroy's review
Merge pull request #200 from eggrobin/no-rvalue-references

Why were these even there?
Merge remote-tracking branch 'la-vache/master' into mocking-the-plugin