Merge branch 'w11_MDL-31494_m23_adodblink' of git://github.com/skodak/moodle