Fixed Bug 915381
Merge pull request #906 from k88hudson/tanay-915381

Fixed Bug 915381