Merge branch 'MDL-27164-master' of git://github.com/micaherne/moodle