Test on 2.5 but allow failure; test with or without opentrep
Update gitignore
Merge branch 'public' into develop