Merge branch 'w50_MDL-30625_m23_adminorder' of git://github.com/skodak/moodle