Merge branch 'MDL-26435_rem_commented_out_code' of git://github.com/andyjdavis/moodle