Merge 3.3/hotfix/fix-versions-in-composer-and-travis