Merge branch 'srdjan-slave-conn' of https://github.com/srdjan-catalyst/moodle