Test again 5.5 too fron now on
Merge branch 'master' into develop
Properly test version-specific features