Merge pull request #1050 from yasoob/master