Merge pull request #1780 from pmanish87/master