Fixed conflicts & merge branch 'MDL-17201_index' of git://github.com/andyjdavis/moodle