Merge branch 'you_should_be_embarassed' into 'master'

Potentially gamebreaking bug fix

Well, see for yourself. It was commit 15c6fbfe.
You added a new argument in different places.