Merge pull request #1371 from Bubu83/patch-4