Merge branch 'em_MDL-25944_20_forummail' of git://github.com/skodak/moodle