Merge branch 'MDL-37014_webdav_folders_23' of git://github.com/davosmith/moodle into...