Merge branch 'w47_MDL-36743_m24_blognotice' of git://github.com/skodak/moodle