Merge branch 'MDL-53548-master' of https://github.com/sammarshallou/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 21 Mar 2016 01:20:33 +0000 (09:20 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 21 Mar 2016 01:20:33 +0000 (09:20 +0800)

Trivial merge