Merge pull request #2391 from Matthias84/patch-4