Merge branch 'MDL-52952-master' of https://github.com/xow/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 21 Mar 2016 06:44:15 +0000 (14:44 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 21 Mar 2016 06:44:15 +0000 (14:44 +0800)

Trivial merge