Merge branch 'mdl36506-master' of git://github.com/tlock/moodle