Merge branch 'w12_MDL-32079_m23_folderrev' of git://github.com/skodak/moodle