Merge branch 'w07_MDL-26389_20_profile' of git://github.com/skodak/moodle