fixed compilation issue.
Merge remote-tracking branch 'upstream/dev-branch' into dev-branch

* upstream/dev-branch:
Merge pull request #1393 from anilgooru/dev-branch

fixed compilation issue.