Merge pull request #1148 from StevenPuttemans:patch_3125