Merge branch 'w51_MDL-37128_m25_rssrestore' of git://github.com/skodak/moodle