Merge pull request #60 from teiid/master

Backport to 2.0.x branch
Merge pull request #61 from teiid/2.0.x

Merge pull request #60 from teiid/master