Merge pull request #48 from teiid/master

Update to support version 6.1