Note to the merge person: This commit might trigger a merge conflict.
In that case, just use the code from the master branch.