Merge when Bug 874837 is closed
Merge pull request #305 from singhabhinavds/master

Merge when Bug 874837 is closed