Merge branch 'MDL-372-int-master' of git://github.com/ryanwyllie/moodle