Changes to discussion

I don't really understand why c7af4b7a812986bcf54a6f4e7bab48cae6f39a06 is included here. I thought you already merged that one.