Merge pull request #1529 from rkoshy/master