Merge branch 'w11_MDL-26621_20_profilemail' of git://github.com/skodak/moodle