Merge pull request #1352 from Bubu83/patch-1