Merge branch 'MDL-38763-master-amd' of git://github.com/mastnym/moodle