Merge pull request #1379 from Bubu83/patch-7