Merge branch 'MDL-39851-master-squashed' of git://github.com/damyon/moodle