Updates for Travis CI integration
Merge branch 'v2.2.3'