Travis, pass 2
Merge branch 'master' of github.com:unikent/moodle-local_catman