Merge branch 'w13_MDL-38654_m25_gdversion' of git://github.com/skodak/moodle