Merge branch 'MDL-52813-master' of git://github.com/jleyva/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 21 Mar 2016 08:37:57 +0000 (16:37 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 21 Mar 2016 08:37:57 +0000 (16:37 +0800)

Trivial merge