goetas Merge pull request #2378 from yourithielen/patch-1