Merge pull request #266 from diogofscmariano/master

[CDF-378] - Fixing compiler error with tests check-in in 817fba620756def...