Merge branch 'w29_MDL-28384_m22_nullurl' of git://github.com/skodak/moodle