Until 2.6
Merge branch 'master' of github.com:mariusei/AST4310