Merge pull request #3679 from rwanyoike/patch-1