Merge pull request #2717 from StevenPuttemans:2.4