Moving to "moodle26" branch

It's about time we made this one into the "moodle26" branch instead of "moodle26-merged"