Merge pull request #1518 from max-m/patch-6