Merge branch 'w17_MDL-32574_m23_adodb' of git://github.com/skodak/moodle