Merge branch 'MDL-68464-master-final' of git://github.com/andrewnicols/moodle