Merge pull request #1377 from Bubu83/patch-6