Merge branch 'MDL-18592-master' of git://github.com/marinaglancy/moodle