Merge pull request #60 from teiid/master

Backport to 2.0.x branch