Merge branch 'w13_MDL-38671_m25_adodb' of git://github.com/skodak/moodle