Merge pull request #1315 from yasoob/master