Merge branch 'MDL-58273-master-ldapenrol' of git://github.com/mudrd8mz/moodle