Merge branch 'w13_MDL-26985_20_branching' of git://github.com/skodak/moodle into...