Merge branch 'MDL-17201_index_19' of git://github.com/andyjdavis/moodle into MOODLE_1...