Resolved compilation issue.
Merge pull request #1835 from VinRudramurthy/dev-branch

Resolved compilation issue.