Merge branch 'MDL-33845_folder_whitespace' of git://github.com/moodler/moodle