Merge pull request #1372 from Bubu83/patch-5