Merge branch 'MDL-30811-fix3' of git://github.com/andrewnicols/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 3 Mar 2016 07:09:47 +0000 (15:09 +0800)
committerDan Poltawski <dan@moodle.com>
Thu, 3 Mar 2016 07:09:47 +0000 (15:09 +0800)

Trivial merge