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