Merge branch 'MDL-26744-metasyncstring_20_STABLE' of git://github.com/wildgirl/moodle...